orxonox/trunk: merged the gui branche back merged with command: https://svn.orxonox.net/orxonox/branches/gui no conflicts