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

* origin/update_geoweb:
  Updated geojs