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

Conflicts:
	application/modules/shop
Pull origin template Base
Pull in TEMPLATE Base
Merge branch 'template' of github.com:imagecms/ImageCMS into template
merge
Merge branch 'template' of github.com:imagecms/ImageCMS into template
Push in TEMPLATE BASE
Merge branch 'template' of github.com:imagecms/ImageCMS into template

Conflicts:
	application/modules/shop
	templates/commerce/shop/default/product.tpl
<3 fixes
<3 fixes
filter change into new category
Merge branch 'template' of github.com:imagecms/ImageCMS into template
JSON - talking with cart;
Merge branch 'template' of github.com:imagecms/ImageCMS into template
merge with master