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 'gamemodel' into client

Conflicts:
	gamemodel/GameMap.cpp
	gamemodel/GameMap.h
Diagonal Movement. Add NetworkBackend.
Villagemenu closed automatically.
NetworkBackend.cpp added
HandleIncommingData.cpp and NetworkBackend.cpp switched.
Merge branch 'gamemodel' into client
send GameAction Recruit and receive it
GetOwner() added to ELocation,
Recruit inside updated.
Merge branch 'gamemodel' into client
Just update
Merge branch 'gamemodel' into client
added OnNetworkAction
Merge branch 'server' into client

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