Pull cart Base
Merge branch 'template' of github.com:imagecms/ImageCMS into template
Push new product Base
main
merg
brands
merge
Merge branch 'template' of github.com:imagecms/ImageCMS into template

Conflicts:
	application/modules/shop
rating
Merge branch 'template' of github.com:imagecms/ImageCMS into template
comments FIN
Merge branch 'template' of github.com:imagecms/ImageCMS into template
Push new product Variant Base
Push new product Variant BaseS
Push new product Variant SBase
new filter tpl done, some scripts for notification added, new category tpl, notification modal added
merge commit
Push new prod Base
Merge branch 'template' of github.com:imagecms/ImageCMS into template
merge with Master