Convert relative urls to absolute urls
Merge branch 'develop'