Merge branch 'master' into ParameterizedDragnDrop

...ui-plugins/StatechartEditorPlugin/StateTreeController.cpp

...tatechartEditorPlugin/view/StatechartEditorMainWindow.cpp

.../StatechartEditorPlugin/view/StatechartEditorMainWindow.h

...StatechartEditorPlugin/view/StatechartEditorMainWindow.ui

.../gui-plugins/StatechartViewerPlugin/IceStateConverter.cpp

...ui/gui-plugins/StatechartViewerPlugin/IceStateConverter.h

...marXGui/gui-plugins/StatechartViewerPlugin/StateScene.cpp

...ArmarXGui/gui-plugins/StatechartViewerPlugin/StateScene.h

...rXGui/gui-plugins/StatechartViewerPlugin/StateWatcher.cpp

...ins/StatechartViewerPlugin/StatechartViewerController.cpp

...ugins/StatechartViewerPlugin/StatechartViewerController.h

...StatechartViewerPlugin/controller/ActiveStateFollower.cpp

...s/StatechartViewerPlugin/controller/ActiveStateFollower.h

...ui-plugins/StatechartViewerPlugin/layout/LayoutWorker.cpp

...arXGui/gui-plugins/StatechartViewerPlugin/model/State.cpp

...Gui/gui-plugins/StatechartViewerPlugin/view/StateItem.cpp

...ui-plugins/StatechartViewerPlugin/view/StateTabWidget.cpp

...ui-plugins/StatechartViewerPlugin/view/StatechartView.cpp

...i-plugins/StatechartViewerPlugin/view/StatechartViewer.ui