Update rails version in gemfile
Remove reserved methods from Collection model
Install spring gem
Merge branch 'rails-4.1'