Merge branch 'bug-15852-u12-platformproject_scalartype_float_to_double' into bug-15852-u13-platformproject_scalartype_float_to_double
Conflicts:
Core/Code/Testing/mitkSliceNavigationControllerTest.cpp
Modules/ContourModel/Rendering/mitkContourModelGLMapper2D.cpp