Updated geojs
Merge branch 'update_geojs'