Test aktualisiert
load
Merge branch 'master' of https://github.com/nigl1011/swe.git

Conflicts:
	shop/src/main/resources/sql/load.sql
	shop/src/test/java/artikelverwaltung/rest/ArtikelResourceTest.java