Lieferung Resource fertig
Merge branch 'master' of https://github.com/nigl1011/swa.git

Conflicts:
	shop/src/main/java/de/shop/util/Mock.java