RGLab/flowWorkspace#119
Merge branch 'trunk' of github.com:RGLab/openCyto into trunk