Lieferant in mock.java hinzugefügt
Merge branch 'artikelbranch'

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