fix base category fix
fix
Merge remote-tracking branch 'origin/template'

Conflicts:
	templates/new_shop_template/main.tpl