removed localhost url
Merge branch 'develop'