add Asset Class + carousel tpl and remove Basset class as it will be not continued
Merge branch 'master' of https://github.com/cherrylabs/arx-core

Conflicts:
	composer.json