manually merged dev and resolved conflicts in: intMapDeleteMap.js, intMapUnDeleteMap.js