Merge branch 'master' of https://github.com/ShopExpress/templates

Conflicts:
	inc/counters.html