Merge branch 'hotfix/heroku'
added gem for heroku
Merge branch 'hotfix/heroku_assets' into develop