fixed url's
Merge branch 'dev'