Merge branch 'clean'

Conflicts:
	Gemfile.lock

2 files changed, 29 insertions, 57 deletions

diff --git a/Gemfile b/Gemfile
index 035fa31..c64c0f0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -29,9 +29,9 @@ end
 # 	gem 'capybara', '2.1.0'
 # end
 
-# Use SCSS for stylesheets
-gem 'sass-rails', '~> 4.0.0'
-gem 'bootstrap-sass'
+# Use LESS for stylesheets
+gem 'less-rails'
+gem 'twitter-bootstrap-rails'
 
 # Use Uglifier as compressor for JavaScript assets
 gem 'uglifier', '>= 1.3.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index b9547b5..48648a9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -19,14 +19,6 @@ GEM
       activesupport (= 4.0.2)
       arel (~> 4.0.0)
     activerecord-deprecated_finders (1.0.3)
-    activerecord-jdbc-adapter (1.3.9)
-      activerecord (>= 2.2)
-    activerecord-jdbcpostgresql-adapter (1.3.9)
-      activerecord-jdbc-adapter (~> 1.3.9)
-      jdbc-postgres (>= 9.1)
-    activerecord-jdbcsqlite3-adapter (1.3.9)
-      activerecord-jdbc-adapter (~> 1.3.9)
-      jdbc-sqlite3 (~> 3.7.2)
     activesupport (4.0.2)
       i18n (~> 0.6, >= 0.6.4)
       minitest (~> 4.2)
@@ -35,9 +27,6 @@ GEM
       tzinfo (~> 0.3.37)
     arel (4.0.2)
     bcrypt-ruby (3.1.2)
-    bcrypt-ruby (3.1.2-java)
-    bootstrap-sass (3.2.0.0)
-      sass (~> 3.2)
     builder (3.1.4)
     carrierwave (0.10.0)
       activemodel (>= 3.2.0)
@@ -47,14 +36,15 @@ GEM
     coffee-rails (4.0.1)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.0)
-    coffee-script (2.2.0)
+    coffee-script (2.3.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.7.0)
+    coffee-script-source (1.8.0)
+    commonjs (0.2.7)
     daemons (1.1.9)
-    delayed_job (4.0.2)
+    delayed_job (4.0.3)
       activesupport (>= 3.0, < 4.2)
-    delayed_job_active_record (4.0.1)
+    delayed_job_active_record (4.0.2)
       activerecord (>= 3.0, < 4.2)
       delayed_job (>= 3.0, < 4.1)
     erubis (2.7.0)
@@ -72,20 +62,20 @@ GEM
     jbuilder (1.5.3)
       activesupport (>= 3.0.0)
       multi_json (>= 1.2.0)
-    jdbc-postgres (9.3.1101)
-    jdbc-sqlite3 (3.7.2.1)
-    jquery-rails (3.1.1)
+    jquery-rails (3.1.2)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    jruby-jars (1.7.13)
-    jruby-rack (1.1.14)
     json (1.8.1)
-    json (1.8.1-java)
+    less (2.5.1)
+      commonjs (~> 0.2.7)
+    less-rails (2.5.0)
+      actionpack (>= 3.1)
+      less (~> 2.5.0)
     libv8 (3.16.14.3)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mailboxer (0.12.1)
+    mailboxer (0.12.3)
       carrierwave (>= 0.5.8)
       foreigner (>= 0.9.1)
       rails (>= 3.2.0)
@@ -93,7 +83,6 @@ GEM
     minitest (4.7.5)
     multi_json (1.10.1)
     multi_xml (0.5.5)
-    pg (0.17.1)
     polyglot (0.3.5)
     rack (1.5.2)
     rack-test (0.6.2)
@@ -115,19 +104,12 @@ GEM
     rdoc (4.1.1)
       json (~> 1.4)
     ref (1.0.5)
-    rubyzip (1.0.0)
-    sass (3.2.19)
-    sass-rails (4.0.3)
-      railties (>= 4.0.0, < 5.0)
-      sass (~> 3.2.0)
-      sprockets (~> 2.8, <= 2.11.0)
-      sprockets-rails (~> 2.0)
-    sdoc (0.4.0)
-      json (~> 1.8)
-      rdoc (~> 4.0, < 5.0)
+    sdoc (0.4.1)
+      json (~> 1.7, >= 1.7.7)
+      rdoc (~> 4.0)
     simple_captcha2 (0.2.2)
       rails (>= 3.1, < 4.1)
-    sprockets (2.11.0)
+    sprockets (2.12.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
@@ -140,37 +122,29 @@ GEM
     therubyracer (0.12.1)
       libv8 (~> 3.16.14.0)
       ref
-    therubyrhino (2.0.3)
-      therubyrhino_jar (>= 1.7.3)
-    therubyrhino_jar (1.7.4)
     thor (0.19.1)
     thread_safe (0.3.4)
-    thread_safe (0.3.4-java)
     tilt (1.4.1)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    turbolinks (2.2.2)
+    turbolinks (2.3.0)
       coffee-rails
-    tzinfo (0.3.40)
-    uglifier (2.5.1)
+    twitter-bootstrap-rails (2.2.8)
+      actionpack (>= 3.1)
+      execjs
+      rails (>= 3.1)
+      railties (>= 3.1)
+    tzinfo (0.3.41)
+    uglifier (2.5.3)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
-    warbler (1.4.3)
-      jruby-jars (>= 1.5.6, < 2.0)
-      jruby-rack (>= 1.0.0)
-      rake (>= 0.9.6)
-      rubyzip (>= 0.9, < 1.1)
 
 PLATFORMS
-  java
   ruby
 
 DEPENDENCIES
-  activerecord-jdbcpostgresql-adapter
-  activerecord-jdbcsqlite3-adapter
   bcrypt-ruby (= 3.1.2)
-  bootstrap-sass
   coffee-rails (~> 4.0.0)
   daemons
   delayed_job_active_record
@@ -178,15 +152,13 @@ DEPENDENCIES
   httparty
   jbuilder (~> 1.2)
   jquery-rails
+  less-rails
   mailboxer
-  pg
   rails (= 4.0.2)
-  sass-rails (~> 4.0.0)
   sdoc
   simple_captcha2
   sqlite3
   therubyracer
-  therubyrhino
   turbolinks
+  twitter-bootstrap-rails
   uglifier (>= 1.3.0)
-  warbler