clean up, remove commented out code
Merge branch 'master' of github.com:gaoyi/RSSExtension

Conflicts:
	RSSLoadableModule/SFLSRobustStatSegmentor3DLabelMap.h
	RSSLoadableModule/SFLSSegmentor3D.cxx
remove merging conflict