asdsa
Merge branch 'master' of https://github.com/Moergil/SpaceStation
Merge branch 'master' of https://github.com/Moergil/SpaceStation
almost final
sMerge branch 'master' of https://github.com/Moergil/SpaceStation

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