Checkstyle Fehler
Merge branch 'master' of https://github.com/arti1011/swa.git

Conflicts:
	shop/src/main/java/de/shop/bestellverwaltung/service/BestellungService.java
Merge branch 'master' of https://github.com/arti1011/swa.git

Conflicts:
	shop/src/main/java/de/shop/bestellverwaltung/service/BestellungService.java