Make minor edits
Merge branch 'master' of https://github.com/Machyne/HotSpot
Add marker image and clean map.js a little