Adjust production environment for heroku
Update gemfile
Update gemfile and clean assets
Fix conflicts