update gemfile.lock for heroku
Merge branch 'develop'