change all to relative url
Merge branch 'develop'