config based base url
Merge branch 'develop'