Fix settings for assets to make production work
Merge branch 'fix_assets_on_production'