change to use localhost to access the server
change client js
Merge remote-tracking branch 'origin/master'