Added gemfile for heroku
Merge branch 'dev'