conflict ok
Merge branch 'jlevallois-Refactoring3dCurvatureViewer' into 3dCViewerMultiCC