Merge branch 'hotfix/heroku_gems'
precomple assets and change prod conf
Merge branch 'hotfix/assets' into develop