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

Conflicts:
	core/src/sk/hackcraft/spacestation/ShipsCreator.java
uaaaargh