Merge
Merge
Entfernen von 'Entfernen nach Bezeichnung'
Merge branch 'master' of https://github.com/ChristofTorres/eShop.git

Conflicts:
	src/shop/local/domain/ShopVerwaltung.java
	src/shop/local/ui/cui/CopyOfShopClientCUI.java
	src/shop/local/ui/cui/ShopClientCUI.java