measure points and map class
merge
removed workspace
database reset ; added interfaces ; formatting ; removed author tags
merged