Merge branch 'T19560-PolhemusMeasurementsEvaluationBranch' into T19560-Integration-2016-10-10
- Conflicts:
- Plugins/org.mitk.gui.qt.igt.app.hummelprotocolmeasurements/src/internal/QmitkIGTTrackingDataEvaluationView.cpp
- Plugins/org.mitk.gui.qt.igt.app.hummelprotocolmeasurements/src/internal/mitkNavigationDataCSVSequentialPlayer.cpp