Changed default server location back to localhost
Merge branch 'client'