cleanup of assets
updated classmap
fix up registration of media asset
Merge branch 'v7.1' of github.com:phpwax/wildfire.media into v7.1

Conflicts:
	ini.php
	setup.php