import: bring in newer Geometry code from another of my projects
refactor: s/getCellCount/getFaceCount
Merge remote-tracking branch 'github/master'

Conflicts:
	common/bigearth/geom/Cursor.java