Merge branch 'server' into network

Conflicts:
	network/CMakeLists.txt
Merged CI and CMake config from master
Merged CMakeLists.txt from master
Merge branch 'network' of https://github.com/msiemens/UH-INF-StrategicGame into network

Conflicts:
	CMakeLists.txt
Fixed problem with inserting player to map
Merge branch 'master' into network

Conflicts:
	network/CMakeLists.txt
Cleanup; GameEngine::onPlayerAction player arg

- Did some cleanup of unneeded TODO comments
- Added PlayerPtr player argument to GameEngine::onPlayerAction