shop widgets
Merge branch 'master' of github.com:imagecms/ImageCMS

Conflicts:
	templates/commerce/shop/default/main.tpl