Updated to rails 4.1
Merge branch 'upgrade_rails_4_1'