Merge branch 'bug-18646-integrate_Sebastian_Ordas_multilabel_plugin' into bug-18647-multilabelsegmentationplugin
- Conflicts:
- Modules/Segmentation/Algorithms/mitkCorrectorAlgorithm.cpp
- Modules/Segmentation/Algorithms/mitkCorrectorAlgorithm.h
- Modules/SurfaceInterpolation/CMakeLists.txt
- Modules/SurfaceInterpolation/files.cmake
- Plugins/PluginList.cmake