Need to fix clicking on map for MapTool
Merge branch 'HEAD' of https://github.com/cavasquez/DD.git