Selection
Merge branch 'master' of https://github.com/Moergil/SpaceStation

Conflicts:
	core/assets/sprite/ship1.png
Merge branch 'master' of https://github.com/Moergil/SpaceStation

Conflicts:
	core/src/sk/hackcraft/spacestation/SpaceStationGame.java