Aenderungen waehrend der Versammlung
Several Changes
Merge branch 'master' of https://github.com/ChristofTorres/eShop.git

Conflicts:
	src/shop/local/persitence/FilePersistenceManager.java
	src/shop/local/ui/cui/ShopClientCUI.java
	src/shop/local/valueobjects/Mitarbeiter.java
	src/shop/local/valueobjects/Rechnung.java
Java Doc Changes