Merge branch 'template'
first of several last commits; all works fine
Merge branch 'master' of github.com:imagecms/ImageCMS

Conflicts:
	application/modules/shop
	templates/new_shop_template/js/jquery.imagecms.js
	templates/new_shop_template/js/shop.js
	templates/new_shop_template/shop/cart.tpl
Merge branch 'template' of github.com:imagecms/ImageCMS