Small Intro fixes
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
Merge branch 'master' of https://github.com/Moergil/SpaceStation
merged
Small Intro fixes
Merge branch 'master' of https://github.com/Moergil/SpaceStation
Small intro fixes