hersteller-sitemap
Merge branch 'master' of https://github.com/flyingSkull/shopware

Conflicts:
	seo/supplier/sitemap.xml
Merge branch 'master' of https://github.com/flyingSkull/shopware

Conflicts:
	seo/supplier/sitemap.xml