Pull from US83 Base
Pull from US83 NoConflict
Push discount Base
Merge branch 'userstory83' of github.com:imagecms/ImageCMS into userstory83

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