Update GitHUB URLs
Merge branch 'dev'