merge
Merge branch 'template' of github.com:imagecms/ImageCMS into template

Conflicts:
	application/modules/shop