Merge branch 'bug-17035-BaseGeometry_IntegrationBranch' into bug-17035-BaseGeometry_IntegrBranch_V2
Conflicts: Core/Code/DataManagement/mitkImage.h Core/Code/Rendering/mitkGeometry2DDataMapper2D.h