Presentation
Merge branch 'tmp/presentation' of https://github.com/msiemens/UH-INF-StrategicGame into tmp/presentation

Conflicts:
	server/GameEngine.cpp