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

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