Updated URLS for Andy
Merge branch 'dev'