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

Conflicts:
	application/modules/shop
	templates/new_shop_template/js/shop.js