Merge remote-tracking branch 'origin/personal/hering/memetic- registration-framework' into T16969-MultiObjective-Registration
Conflicts:
Modules/DiffusionImaging/DiffusionCore/CMakeLists.txt
Modules/DiffusionImaging/DiffusionCore/include/IODataStructures/DiffusionWeightedImages/mitkDiffusionImageCreationFilter.h
Modules/DiffusionImaging/DiffusionCore/include/IODataStructures/DiffusionWeightedImages/mitkDiffusionImageTransformedCreationFilter.h
Modules/DiffusionImaging/DiffusionCore/src/IODataStructures/DiffusionWeightedImages/mitkDiffusionImageCreationFilter.cpp