Updated geojs to current master
Merge remote-tracking branch 'origin/update_geojs' into next