update gemfile.lock
Merge branch 'rm_production'