Mega push (with conflicts!)
Merge branch 'master' of https://github.com/ofrendo/Fallstudie

Conflicts:
	Client/src/de/client/gui/PanelMenuInformation.java
	Shared/src/de/shared/message/MessageTypeToClient.java