Merge branch 'master' into zz_local
new CellFactory, GridMap works

new CellFactory, GridMap works
Merge branch 'zz_local'