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

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

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

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