Merge branch 'bug-13788-update-MITK-Diffusion-version' into bug-13788-MitkDiffusion_2012.12
removed as of yet not implemented filtering option
Merge branch 'bug-13838-implement-properties-for-controling-connectomics-rendering'
COMP: Fixed capitalization
Merge branch 'bug-13838-fix-compiler-issues'
updated gui for selected dwi handling
Merge branch 'bug-14086-FiberfoxGuiUpdate' into bug-13788-MitkDiffusion_2012.12
allowing diffusivity change. gui and documentation update
Merge branch 'bug-14089-BallModelDiff' into bug-13788-MitkDiffusion_2012.12
enable highest sh-order interpolation
Merge branch 'bug-14086-FiberfoxGuiUpdate'
Merge branch 'bug-13391-MultipleShellReconstructionInterpolation' into bug-13788-MitkDiffusion_2012.12
Merge branch 'bug-13391-MultipleShellReconstructionInterpolation'

Conflicts:
	Modules/DiffusionImaging/Reconstruction/itkDiffusionMultiShellQballReconstructionImageFilter.cpp
Merge branch 'bug-12700-overlayController-improvements'

Conflicts:
	Modules/Overlays/QmitkOverlayController.cpp
	Modules/Overlays/QmitkOverlayController.h
	Modules/Overlays/QmitkScalarBarOverlay.h
Set source to dirty
Merge branch 'bug-13788-MitkDiffusion_2012-12'
Merge branch 'bug-12704-ContourModel-final-integration'

Conflicts:
	Modules/Segmentation/Algorithms/mitkSegmentationObjectFactory.cpp
	Modules/Segmentation/DataManagement/mitkContour.h
Use old camera parameters for camcube as default.
Merge branch 'bug-13923-KinectTexture'
KinectController will throw an exception if there is not connection. ToFUtil and the test are catching it.