Merge branch 'master' into bug-18261-MakePluginsCompatibleToQt5
Conflicts:
Plugins/org.mitk.gui.qt.dicom/src/internal/mitkPluginActivator.cpp
Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkControlVisualizationPropertiesView.cpp
Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTensorReconstructionView.cpp