Bestellung Work in Progress
Merge branch 'DANGERLAST'

Conflicts:
	shop/src/main/java/de/shop/util/AbstractShopException.java
Merge branch 'master' of https://github.com/GPS-HsKA/Bike-Shop-repo.git