product numer articul i cart;
Merge branch 'template' of github.com:imagecms/ImageCMS into template
monday, wishlist;
refreshing products list in cart fixed
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
gallery
Merge branch 'template' of github.com:imagecms/ImageCMS into template
categories in search
datepicker fixed, including jquery ui returned into main tpl
Merge branch 'template' of github.com:imagecms/ImageCMS into template
Push Product Page Base
Merge branch 'template' of github.com:imagecms/ImageCMS into template
shop empty commit
Merge branch 'template' 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
find in cats fixed according to new brands php in old template
Merge branch 'template' of github.com:imagecms/ImageCMS into template
autocomplete in search input