Merge
Merge branch 'master' of https://github.com/bema1024/swa.git

Conflicts:
	shop/src/main/java/de/shop/kundenverwaltung/rest/KundeResource.java