Merge branch 'master' of https://github.com/CompuCell3D/CompuCell3D
minor changes - to get rid of warnings
Merge branch 'master' into 3.7.1