Merge branch 'T22595-MasterIntegration-2017-10-12' into T22595-Masterintegration-2018-01-09
- Conflicts:
- Modules/IGTUI/Qmitk/QmitkMicronTrackerWidget.h
- Modules/IGTUI/Qmitk/QmitkNDIAuroraWidget.h
- Modules/IGTUI/Qmitk/QmitkNDIPolarisWidget.h
- Modules/IGTUI/Qmitk/QmitkNPOptitrackWidget.h
- Modules/IGTUI/Qmitk/QmitkOpenIGTLinkWidget.h
- Modules/IGTUI/Qmitk/QmitkVirtualTrackerWidget.h