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