Minor change to map page
Added all popups on map
Merge branch 'master' of github.com:nkabrown/japan-spa into HEAD