Merge
Merge branch 'master' of
https://github.com/ChristofTorres/eShop-Server.git

Conflicts:
	eShop Server/src/shop/server/domain/ShopVerwaltung.java
	eShop Server/src/shop/server/net/ClientRequestProcessor.java
Merge
Merge branch 'master' of https://github.com/ChristofTorres/eShop-Server.git