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

Conflicts:
	templates/new_shop_template/shop/default/category.tpl
	templates/new_shop_template/shop/default/js/shop.js