Edit main view
Merge remote-tracking branch 'origin/master'

Conflicts:
	data/Smarty/templates/default_en-US/frontparts/bloc/recommend.tpl

	data/Smarty/templates_c/default_en-US/%%00^001^00145EBD%%recommend.tpl.php
	html/winner/winner.php