Upgraded to rails 4.1
Merge branch 'rails-to-4-1'