Changed to relative urls
Merge branch 'develop' into gh-pages