test
Merge branch 'master' of https://github.com/danielstorch/shop-repo.git

Conflicts:
	shop/src/main/java/de/shop/artikelverwaltung/service/ArtikelService.java
Merge remote-tracking branch 'origin/master'