B2879 Coupon code can be bypassed
B2879 Coupon code can be bypassed
B2879 Coupon code can be bypassed - Add sucess message
B2879 Coupon code can be bypassed - Add sucess message
Merge branch 'develop' of github.com:loadedcommerce/loaded7 into develop
Merge remote-tracking branch 'remotes/origin/B2879' into develop

Conflicts:
	catalog/includes/languages/en_US.xml
	catalog/templates/core/content/checkout/checkout_shipping.php