Push Base
PushS
Merge remote-tracking branch 'origin/template'

Conflicts:
	templates/new_shop_template/shop/product.tpl