Add map.js
Add drawing directions
Fix merge