task #9604 add trusted shop kaeuferschutz
Merge branch 'version-4.6' of ssh://github.com/bilandia-fg/diplom into version-4.6

Conflicts:
	brand-files/templates/Grin.gtpl