discount
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/modules/market/controllers/discount.php