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

Conflicts:
	shop/src/test/java/de/shop/bestellverwaltung/rest/BestellungResourceTest.java