category new tpl beginning
merge new category tpl commit
Merge remote-tracking branch 'origin/template'

Conflicts:
	application/modules/CMSFactory/BaseEvents.php
	application/modules/shop