Merge remote-tracking branch 'fsmanuel/master' into master.

Updated migration date to today.

Conflicts:
	db/schema.rb

Gemfile.lock

@@ -97,7 +97,7 @@ GEM
     has_scope (0.5.1)
     hashery (2.0.1)
     highline (1.6.19)
-    hike (1.2.1)
+    hike (1.2.3)
     i18n (0.6.1)
     inherited_resources (1.3.1)
       has_scope (~> 0.5.0)
@@ -136,7 +136,7 @@ GEM
       polyamorous (~> 0.5.0)
     mime-types (1.21)
     mono_logger (1.1.0)
-    multi_json (1.7.3)
+    multi_json (1.7.6)
     mysql2 (0.3.11)
     net-scp (1.1.1)
       net-ssh (>= 2.6.5)
@@ -174,6 +174,8 @@ GEM
       activesupport (= 3.2.13)
       bundler (~> 1.0)
       railties (= 3.2.13)
+    rails-settings-cached (0.2.4)
+      rails (>= 3.0.0)
     railties (3.2.13)
       actionpack (= 3.2.13)
       activesupport (= 3.2.13)
@@ -209,7 +211,7 @@ GEM
       activesupport (>= 2.3.2)
     simple-navigation-bootstrap (0.0.4)
       simple-navigation (>= 3.7.0)
-    simple_form (2.0.3)
+    simple_form (2.1.0)
       actionpack (~> 3.0)
       activemodel (~> 3.0)
     sinatra (1.3.6)
@@ -285,6 +287,7 @@ DEPENDENCIES
   prawn
   quiet_assets
   rails (~> 3.2.9)
+  rails-settings-cached (= 0.2.4)
   resque
   ruby-prof
   sass-rails (~> 3.2.3)