update Rails 4.1
Merge branch 'rails_4.1'