Update submodule URLs
Merge branch 'dev'