Umlaute entfernt
Merge branch 'Umlaute'

Conflicts:
	webshop/src/main/java/de/webshop/util/Mock.java