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