merge commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	shop/src/main/java/de/shop/bestellverwaltung/domain/Bestellung.java