Pull from US83 Base
Pull from US83 NoConflict
fix
permition hot fix, front order view
permition hot fix, front order view
Merge branch 'userstory83' of github.com:imagecms/ImageCMS into userstory83
Push discount Base
Merge branch 'userstory83' of github.com:imagecms/ImageCMS into userstory83

Conflicts:
	templates/commerce/shop/default/product.tpl
Bug's pack5
Merge branch 'userstory83' of github.com:imagecms/ImageCMS into userstory83
Merge remote-tracking branch 'origin/userstory83'