merge
Merge branch 'master' of https://github.com/spti1011/swe.git

Conflicts:
	shop/src/main/java/de/shop/bestellverwaltung/rest/BestellungResource.java