deleted node class, modified mapdot class, modified mapactivity and xml files.
fixed merge conflicts
fixed merge conflicts