fixed
template resources multi-asseting fixed
Merge remote-tracking branch 'origin/template'

Conflicts:
	application/modules/CMSFactory/BaseEvents.php