new asset WIP
Merge branch 'master' into new-asset
new asset WIP [skip ci]
new asset WIP: renabled asset publishing
WIP
Merge branch 'master' into new-asset

Conflicts:
	apps/basic/composer.json
	composer.json