Added map to building insert, added edit capability for rooms and buildings
Merging my changes