orxonox/trunk: merged the QT_GUI back to the trunk merged with command: svn merge https://svn.orxonox.net/orxonox/branches/qt_gui . -r7607:HEAD
absolutely no conflicts