relative urls
Merge branch 'master' into gh-pages
links with local urls