Initial Rails 4.0.x upgrade

Gemfile

@@ -1,7 +1,8 @@
 source 'https://rubygems.org'
 
 #don't upgrade
-gem 'rails', '3.2.19'
+gem 'rails', '4.0.9'
+gem 'protected_attributes' # For Rails 4.0+
 
 ruby '2.1.2'
 
@@ -44,15 +45,12 @@ end
 
 # Gems used only for assets and not required
 # in production environments by default.
-group :assets do
-  gem 'sass-rails'
-  gem 'coffee-rails'
-  gem 'jquery-fileupload-rails'
-  # See https://github.com/sstephenson/execjs#readme for more supported runtimes
-  # gem 'therubyracer', :platforms => :ruby
-
-  gem 'uglifier'
-end
+gem 'sass-rails'
+gem 'coffee-rails'
+gem 'jquery-fileupload-rails'
+gem 'uglifier'
+# See https://github.com/sstephenson/execjs#readme for more supported runtimes
+# gem 'therubyracer', :platforms => :ruby
 
 gem 'jquery-rails'