Merge branch 'master' into niftk

Conflicts:
	Core/Code/Rendering/mitkImageVtkMapper2D.cpp