bugfix for map.html (forgot to upgrade jquery/leaflet libs there)
Merge branch 'master' into gh-pages