Add Gemfile.lock for heroku
Merge branch 'dev'