update Gemfile.lock for heroku
Merge branch 'heroku-test'