Reenabling organ segmentation module.
Merge branch 'refactoring' into develop
Mask rendering, drawing.

Working on th segmentation module.