Daily Commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	catalog/controller/product/deal_mail.php