Update local url to live one
Merge branch 'master' into gh-pages