pokusam sa to rozbehat na lokale
Merge branch 'master' of https://github.com/Moergil/SpaceStation

Conflicts:
	core/src/sk/hackcraft/spacestation/SpaceStationGame.java
graphical updates, added some candy to space view
Merge branch 'master' of https://github.com/Moergil/SpaceStation

Conflicts:
	core/src/sk/hackcraft/spacestation/Dock.java
	core/src/sk/hackcraft/spacestation/GoodsType.java
	core/src/sk/hackcraft/spacestation/Planet.java
	core/src/sk/hackcraft/spacestation/PlanetTask.java
	core/src/sk/hackcraft/spacestation/ShipsQueueMenu.java
	core/src/sk/hackcraft/spacestation/SpaceStationGame.java
	core/src/sk/hackcraft/spacestation/TimeGenerator.java