Merge remote-tracking branch 'remotes/origin/T22595-NavigationModules-2016.11.3-igt' into T22595-Masterintegration-2018-01-09
- Conflicts:
- Modules/IGTUI/Qmitk/QmitkInteractiveTransformationWidget.cpp
- Modules/IGTUI/Qmitk/QmitkNavigationToolCreationAdvancedWidget.cpp
- Modules/IGTUI/Qmitk/QmitkNavigationToolCreationAdvancedWidget.h
- Modules/IGTUI/Qmitk/QmitkNavigationToolCreationWidget.cpp
- Modules/IGTUI/Qmitk/QmitkNavigationToolCreationWidget.h
- Modules/IGTUI/Qmitk/QmitkNavigationToolManagementWidget.cpp
- Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/USNavigationMarkerPlacement.h
- Plugins/org.mitk.gui.qt.igttracking/src/internal/IGTNavigationToolCalibration.cpp
- Plugins/org.mitk.gui.qt.igttracking/src/internal/QmitkMITKIGTTrackingToolboxView.cpp