Merge branch 'release/heroku1'
Update gemfile