merge;
Merge branch 'master' of github.com:imagecms/ImageCMS into template
cmpr
Merge branch 'template' of github.com:imagecms/ImageCMS into template
Merge branch 'master' of github.com:imagecms/ImageCMS into template
comparelist and wishlist head lines;
Merge remote-tracking branch 'origin/template'

Conflicts:
	templates/new_shop_template/js/shop.js