Merge remote-tracking branch 'origin/template'
and more fix
empty commit
Merge remote-tracking branch 'origin/template'
Event manager fix
Merge remote-tracking branch 'origin/template'

Conflicts:
	application/modules/CMSFactory/BaseEvents.php
Event manager
fix
fix
Merge branch 'template' of github.com:imagecms/ImageCMS into template