product numer articul i cart;
widget tpl fix
Widgets fix
Merge remote-tracking branch 'origin/template'
clearing
Merge remote-tracking branch 'origin/template'
gitignore change
monday, wishlist;
Merge branch 'template' of github.com:imagecms/ImageCMS into template

Conflicts:
	templates/new_shop_template/shop/wish_list.tpl
Merge branch 'master' of github.com:imagecms/ImageCMS into template
zero in cart, recount
Merge branch 'template' of github.com:imagecms/ImageCMS into template

Conflicts:
	application/modules/shop