Merge remote-tracking branch 'origin/update_geoweb'

* origin/update_geoweb:
  Updated geojs
Updated geoweb to use current geojs
Updated geojs reference
Updated variable names for consistency
Merge remote-tracking branch 'origin/update_geojs' into next

* origin/update_geojs:
  Updated variable names for consistency
  Updated geojs reference
  Updated geoweb to use current geojs