manage assets
Merge branch 'feature.assets' into dev

Conflicts:
	_layouts/base.html