Pull project for TEST
Pull for test Base
Fix bug Price and water mark
Pull for test WM Base
Push js
Psh fix bugs page cart and products Base
Fix Photo product
orders
Merge branch 'userstory83' of github.com:imagecms/ImageCMS into userstory83
Fix price variand
brands product, search, category
Merge branch 'userstory83' of github.com:imagecms/ImageCMS into userstory83
feedback captcha switched off
Merge branch 'userstory83' of github.com:imagecms/ImageCMS into userstory83
Merge US83 and master