Merge branch 'bug-3104-IntegrationThreadedImageStatistics'

Conflicts:
.gitattributes
CMake/mitkMacroInstall.cmake
Modules/CMakeLists.txt
Modules/DiffusionImaging/IODataStructures/DiffusionWeightedImages/mitkNrrdDiffusionImageReader.cpp
Modules/Segmentation/Algorithms/mitkDiffSliceOperation.cpp
Modules/Segmentation/Algorithms/mitkDiffSliceOperationApplier.cpp
Modules/Segmentation/Interactions/mitkSegTool2D.cpp
Modules/Segmentation/Testing/files.cmake
Modules/US/USFilters/mitkUSImageVideoSource.cpp
Modules/US/USModel/mitkUSDevice.cpp
Modules/US/USModel/mitkUSDevice.h
Modules/US/USModel/mitkUSVideoDevice.cpp
Modules/USUI/CMakeLists.txt
Modules/USUI/Qmitk/QmitkUSDeviceManagerWidget.h
Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFiberProcessingView.cpp
Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsView.cpp
Plugins/org.mitk.gui.qt.ultrasound/src/internal/UltrasoundSupport.cpp
Plugins/org.mitk.gui.qt.ultrasound/src/internal/UltrasoundSupport.h
Plugins/org.mitk.gui.qt.ultrasound/src/internal/UltrasoundSupportControls.ui
Plugins/org.mitk.gui.qt.ultrasound/src/internal/org_mitk_gui_qt_ultrasound_Activator.cpp
Plugins/org.mitk.gui.qt.ultrasound/src/internal/org_mitk_gui_qt_ultrasound_Activator.h