Test
Merge remote-tracking branch 'origin/master'

Conflicts:
	shop/src/main/java/shop/kundenverwaltung/rest/KundeResource.java
Merge branch 'master' of https://github.com/gapa1015/shop-repo.git