Ray's changes in structure

Changes for queries

.gitignore

@@ -1,23 +1,20 @@
 !.gitignore
-Gemfile.lock
 .bundle
-db/*.sqlite3
-log/*.log
-tmp/**/*
-public/uploads/**/*
-uploads/**/*
-public/panel/**/*
-public/index.html
 .DS_Store
-solr/data/**/*
-*.swp
-*.pid
-*.lck
-public/assets
-config/application.rb
-
 .rvmrc
 
-app/assets/javascripts/.DS_Store
+Gemfile.lock
 
+db/*.sqlite3
+log/*.log
+public/assets
+public/index.html
+public/panel/**/*
+public/uploads/**/*
 solr
+tmp/**/*
+uploads/**/*
+
+*.swp
+*.pid
+*.lck

Gemfile

@@ -13,6 +13,7 @@ gem 'exception_notification' # Send error trace
 gem 'execjs'
 gem 'jquery-rails', '2.1.4'
 gem 'jquery-ui-rails'
+gem "select2-rails", '3.3.1'
 gem 'kaminari', :git => 'git://github.com/amatsuda/kaminari.git'
 
 # gem "memcached", "~> 1.4.3"

Gemfile.lock

@@ -91,7 +91,6 @@ GEM
       execjs
     coffee-script-source (1.4.0)
     columnize (0.3.6)
-    curb (0.8.3)
     database_cleaner (0.9.1)
     debug_inspector (0.0.2)
     debugger (1.2.4)
@@ -128,13 +127,6 @@ GEM
       multi_json (>= 1.3)
       rack-oauth2 (>= 0.14.4)
       tzinfo
-    feedzirra (0.0.24)
-      activesupport (>= 2.3.8)
-      builder (>= 2.1.2)
-      curb (>= 0.2.3)
-      loofah (>= 0.3.1)
-      nokogiri (> 0.0.0)
-      sax-machine (>= 0.0.12)
     ffi (1.4.0)
     haml (3.1.8)
     highline (1.6.15)
@@ -149,8 +141,6 @@ GEM
       jquery-rails
       railties (>= 3.1.0)
     json (1.7.7)
-    loofah (1.2.1)
-      nokogiri (>= 1.4.4)
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -285,8 +275,9 @@ GEM
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    sax-machine (0.1.0)
+    select2-rails (3.3.1)
-      nokogiri (> 0.0.0)
+      sass-rails (>= 3.2)
+      thor (~> 0.14)
     selenium-webdriver (2.30.0)
       childprocess (>= 0.2.5)
       multi_json (~> 1.0)
@@ -365,7 +356,6 @@ DEPENDENCIES
   factory_girl_rails
   faker
   fb_graph
-  feedzirra
   impressionist!
   jquery-rails (= 2.1.4)
   jquery-ui-rails
@@ -397,6 +387,7 @@ DEPENDENCIES
   rspec-rails (~> 2.0)
   rubyzip
   sass-rails
+  select2-rails (= 3.3.1)
   shoulda-matchers
   simplecov
   sinatra