before complete kits;
Merge branch 'template' of github.com:imagecms/ImageCMS into template

Conflicts:
	application/modules/shop
Push Base
Push BaseS
Merge remote-tracking branch 'origin/template'

Conflicts:
	application/libraries/template.php