Updated geojs
Merge remote-tracking branch 'origin/update_geojs'