Adding proper urls for x-sherpa sites
Merge branch 'dev'