Merge branch 'master' into updated-gems

Conflicts:
	Gemfile.lock

Gemfile

@@ -36,7 +36,7 @@ gem 'simple-navigation-bootstrap'
 gem 'meta_search'
 gem 'acts_as_versioned', git: 'git://github.com/technoweenie/acts_as_versioned.git' # Use this instead of rubygem
 gem 'acts_as_tree'
-gem 'acts_as_configurable', git: 'git://github.com/bwalding/acts_as_configurable.git'
+gem "rails-settings-cached", "0.2.4"
 gem 'resque'
 gem 'whenever', require: false # For defining cronjobs, see config/schedule.rb
 
@@ -51,7 +51,8 @@ group :development do
   # Better error output
   gem 'better_errors'
   gem 'binding_of_caller'
-
+  # gem "rails-i18n-debug"
+  
   # Re-enable rails benchmarker/profiler
   gem 'ruby-prof'
   gem 'test-unit'
@@ -69,3 +70,7 @@ group :development do
   # Avoid having content-length warnings
   gem 'thin'
 end
+
+# Gems left for backwards compatibility
+gem 'acts_as_configurable', git: 'git://github.com/bwalding/acts_as_configurable.git' # user settings migration needs it
+