Updates to Preset Discount Codes
Updates to Preset Discounts
Merge remote-tracking branch 'remotes/origin/proimage-v2.2'

Conflicts:
	PhotoCP/includes/query_preset_discount_codes.php