update
Updated Geojson
remove "prototype"
Merge remote-tracking branch 'origin/master' into gh-pages
various bug fixes