Changes K"42
Merge remote-tracking branch 'origin/weekly-deal' into weekly-deal

Conflicts:
	deal.php
	deal_dispatcher.php