progress in winner
Merge branch 'master' of https://github.com/morningintern/TC_SHOP

Conflicts:
	data/Smarty/templates_c/default_en-US/%%7D^7D1^7D12355D%%header.tpl.php