Merge branch 'master' of https://i61wiki.itec.uka.de/git/armarxgui

etc/doxygen/pages/API-ArmarXGui.dox

etc/doxygen/pages/ArmarXGui-API-1-overview.dox

etc/doxygen/pages/ArmarXGui-API-2-guiplugin.dox

etc/doxygen/pages/ArmarXGui-API-3-API.dox

etc/doxygen/pages/ArmarXGui-app.dox

etc/doxygen/pages/ArmarXGui-lib.dox

etc/doxygen/pages/ArmarXGui-plugin.dox

etc/doxygen/pages/mainpage.dox

etc/doxygen/pages/slicedocumentation.dox

source/Gui/ArmarXGui/ArmarXGuiApp.h

source/Gui/ArmarXGuiLib/ArmarXGuiPlugin.h