Merged segmentation functionality into Volume plugin
Merge branch 'master' of https://github.com/CalVR/calvr_plugins

Conflicts:
	calit2/Volume/Volume.cpp
	calit2/Volume/Volume.h