Changed mapcoloroverlay to enable add overlay in qmapwidget
merge and fix conflicts