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

Conflicts:
	core/src/sk/hackcraft/spacestation/TaskStarter.java
Modification of Tasks
Merge branch 'master' of https://github.com/Moergil/SpaceStation

Conflicts:
	core/src/sk/hackcraft/spacestation/Planet.java
	core/src/sk/hackcraft/spacestation/SpaceStationGame.java
dsajdsjMerge branch 'master' of https://github.com/Moergil/SpaceStation

Conflicts:
	core/src/sk/hackcraft/spacestation/SpaceStationGame.java
repair commit
Merge branch 'master' of https://github.com/Moergil/SpaceStation

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