findallbestellungen
Merge remote-tracking branch 'origin/master'

Conflicts:
	shop-maven/src/main/java/de/shop/artikelverwaltung/rest/ArtikelResource.java