3,4
Merge branch 'master' of https://github.com/Oguzhan204/Fahrradshop.git

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