Enable config.serve_static_assets
Merge branch 'hotfix/heroku-fixes'

* hotfix/heroku-fixes:
  Enable config.serve_static_assets