There are some issues which do not occur until the merge, and thus, can only be fixed after the merge.
This bug summarizes them:
1.Checkout Geometry2DDataVtkMapper3D.cpp, mitkDiffusionImagingObjectFactory.cpp and mitkExtractDirectedPlaneImageFilter.cpp from the bug-9176-RenderingIntegrationBranch, because the automatic merge accidently did some stuff wrong here
2.Change in mitkImageVTKMapper2D "GenerateData()" to "GenerateDataForRenderer()", in order to enable the channel system of thr dwi images
3.Use the new "WorldToIndex( vec, vec )" instead of the deprecated "WorldToIndex( origin, vec, vec )" in mitkImageVTKMapper2D