Put, Delete zuende gemacht
fehler in Mock behoben
Merge branch 'Andi'

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