main.tpl for bouth template
Merge remote-tracking branch 'origin/template'

Conflicts:
	templates/new_shop_template/main.tpl
main tpl fix links
fix