refactor1
map state
new network
compiling, yaaaaaaay
Merge commit '0a750034f89578bc2ae48024486030252edc6d1d' into new-network

Conflicts:
	test/core/src/com/test/game/TimeBase.java
	test/core/src/com/test/model/time/TimeVariations.java
	test/core/src/com/test/screens/GameMapStage.java
	test/core/src/com/test/screens/GameScreen.java
	test/core/src/com/test/screens/Planet.java
	test/core/src/com/test/systems/DataSystem.java
Merge commit 'aa840acf132014787f68be734bdc0234a2211cf0' into new-network

Conflicts:
	test/core/src/com/test/screens/GameMapStage.java
	test/core/src/com/test/screens/Planet.java
	test/core/src/com/test/systems/DataSystem.java
working
Merge branch 'new-network'

Conflicts:
	test/core/src/com/test/screens/GameMapStage.java
update states
Merge remote-tracking branch 'origin/master' into refactor-gamemap
Assets
command
Merge remote-tracking branch 'origin/master' into refactor-gamemap

Conflicts:
	test/core/src/com/test/screens/GameMapStage.java
	test/core/src/com/test/screens/Planet.java
Merge commit 'd5df01c640b804de0a07192e98484bc0e56f964d' into screens-backgrounds

Conflicts:
	test/core/src/com/test/systems/AssetsSystem.java