merging fixes
fixed delete file issue
fixes to map
fixes to merging issues
switch map system to google maps
switch map system to google maps