Merge branch 'master' into ScenarioManagerIceExecuting

source/ArmarXGui/applications/ArmarXGui/ArmarXMainWindow.cpp

source/ArmarXGui/applications/ArmarXGui/ArmarXMainWindow.h

...XGui/applications/ArmarXGui/Widgets/EmergencyStopWidget.h

...ArmarXGui/applications/ArmarXGui/Widgets/ViewerWidget.cpp

...e/ArmarXGui/applications/ArmarXGui/Widgets/ViewerWidget.h

...marXGui/gui-plugins/ClockPlugin/ClockWidgetController.cpp

...ArmarXGui/gui-plugins/ClockPlugin/ClockWidgetController.h

...s/ConditionViewerPlugin/ConditionViewerWidgetController.h

...ArmarXGui/gui-plugins/IceProxy/IceProxyWidgetController.h

...Gui/gui-plugins/LoggingPlugin/ArmarXLogViewer/LogViewer.h

...ui-plugins/ObserverPropertiesPlugin/ObserverItemModel.cpp

...ugins/ObserverPropertiesPlugin/ObserverWidgetController.h

...lugins/ObserverPropertiesPlugin/widgets/VariantWidget.cpp

source/ArmarXGui/gui-plugins/PlotterPlugin/ArmarXPlotter.cpp

source/ArmarXGui/gui-plugins/PlotterPlugin/ArmarXPlotter.h

...gui-plugins/PlotterPlugin/StaticPlotterWidgetController.h

...ugins/ScenarioManager/ScenarioManagerWidgetController.cpp

...plugins/ScenarioManager/ScenarioManagerWidgetController.h

...ins/ScenarioManager/controller/openscenariocontroller.cpp

...i-plugins/ScenarioManager/gui/OptionalPropertyManager.cpp