Feature/rails update 2013 12 10

`bundle exec rake rails:update`