asset compile
Merge branch 'develop'

Conflicts:
	public/production/manifest.yml