enable assets compile in production mode
Merge branch 'dev'
Merge branch 'master' into production