fix some URLs
Merge branch 'dev'