Update rails gem
Merge branch 'staging'