KundeResourceConcurrencyTest hinzugefügt
Merge branch 'master' of https://github.com/michaelschwarz1/swe.git

Conflicts:
	shop/src/main/resources/META-INF/persistence.xml
persistence