Infrastruktur für Test-Erstellung hergestellt
Merge branch 'master' of https://github.com/arti1011/swa.git

Conflicts:
	shop/src/main/java/de/shop/kundenverwaltung/rest/KundeResource.java
	shop/src/main/java/de/shop/util/rest/ConcurrentDeletedExceptionMapper.java
	shop/src/main/java/de/shop/util/rest/NoMimeTypeExceptionMapper.java
	shop/src/main/java/de/shop/util/rest/OptimisticLockExceptionMapper.java
	shop/src/main/java/de/shop/util/rest/ShopExceptionMapper.java
	shop/src/main/resources/ApplicationMessages_de.properties
	shop/src/main/resources/ApplicationMessages_en.properties
	shop/src/main/resources/ValidationMessages.properties
	shop/src/main/resources/ValidationMessages_de.properties
	shop/src/main/resources/ValidationMessages_en.properties
	shop/src/main/resources/sql/create.sql
	shop/src/main/resources/sql/load.sql
	shop/src/test/java/de/shop/artikelverwaltung/rest/ArtikelResourceConcurrencyTest.java
	shop/src/test/java/de/shop/artikelverwaltung/rest/ArtikelResourceTest.java
	shop/src/test/java/de/shop/kundenverwaltung/rest/KundeResourceTest.java
	shop/src/test/java/de/shop/util/TestConstants.java
Merge branch 'master' of https://github.com/arti1011/swa.git