orxonox/trunk: merged the SpaceShipControl branche back to the trunk
merged with command: svn merge https://svn.orxonox.net/orxonox/branches/spaceshipcontrol . -r6482:HEAD
minor conflicts, and added file hover.cc/h to the Makefile.