Assets
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