B3311 Paypal ignoring coupons
Merge remote-tracking branch 'remotes/origin/B3311' into develop

Conflicts:
	catalog/includes/classes/coupons.php