Merge remote-tracking branch 'origin/update_geojs'

* origin/update_geojs:
  Updated variable names for consistency
  Updated geojs reference
  Updated geoweb to use current geojs
Merge remote-tracking branch 'origin/162-tooltip-tutorial'

* origin/162-tooltip-tutorial:
  Adds simple tutorial using tooltips
Updated geojs
Merge remote-tracking branch 'origin/update_geojs' into next