Merge remote-tracking branch 'origin/T19830-fix-rendering-of-arbitrary-TimeGeometries-master' into releases/2016-11
Conflicts:
Modules/Core/include/mitkArbitraryTimeGeometry.h
Modules/Core/src/Controllers/mitkSliceNavigationController.cpp
Modules/Core/src/DataManagement/mitkArbitraryTimeGeometry.cpp
Modules/Core/src/DataManagement/mitkProportionalTimeGeometry.cpp
Modules/Core/src/DataManagement/mitkTimeGeometry.cpp
Modules/Core/test/mitkArbitraryTimeGeometryTest.cpp
Signed-off-by: Ralf Floca <r.floca@dkfz-heidelberg.de>