Get
Merge branch 'master' of https://github.com/gapa1015/shop-repo.git
Merge branch 'master' of https://github.com/gapa1015/shop-repo.git

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