Merge branch 'develop'
Don't use hostname or port for server + proxy
Move complicated strings to separate template files