fix urls
Merge branch 'develop'