Work on map.js
Merge branch 'master' of https://github.com/Machyne/HotSpot