Updated server URL
Merge branch 'server'