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

Conflicts:
	CMakeLists.txt
Merge branch 'server' into client

Conflicts:
	.travis.yml
	network/CMakeLists.txt
Server merged to Client and edit server in client for some tests.