Update rails gem to 4.1.7
Update Gemfile.lock
Merge branch 'develop'