Switched from SVN repos to GitHub repos.
Fixed merge of submodule.