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