Tests delete
Merge branch 'master' of https://github.com/Hamfor/WS-4

Conflicts:
	src/test/java/edu/chl/hajo/shop/core/TestShopPersistence.java