bla.
Merge branch 'master' of https://github.com/bema1024/swa.git

Conflicts:
	shop/src/main/java/de/shop/artikelverwaltung/rest/ArtikelResource.java
	shop/src/main/java/de/shop/bestellverwaltung/rest/BestellungResource.java