MMapGenTree Line 848
Merge branch 'master' of https://github.com/scuellar/MMap

Conflicts:
	MSet/MMapGenTree.v