Kleine Anpassung in PositionResource
Umbenennung Id -> ID
Merge branch 'bestellverwaltung'
Merge branch 'master' of https://github.com/dastdev/shop.git

Conflicts:
	webshop/src/main/java/de/webshop/kundenverwaltung/rest/KundeResource.java