Merge
Merge branch 'asd'

Conflicts:
	shop/src/main/java/de/shop/kundenverwaltung/domain/Kunde.java