Merge remote-tracking branch 'origin/fix_gitmodules'

* origin/fix_gitmodules:
  Fixed git submodule pushurl
Updated geojs
Merge remote-tracking branch 'origin/update_geoweb' into next

* origin/update_geoweb:
  Updated geojs