no message
Merge branch 'master' of https://github.com/HorsesInSpace/Horses-in-Space

Conflicts:
	core/src/com/HiS/graphics/GameRenderer.java