updated client side (no websocket change)
Merge branch 'master' of https://github.com/yuguang/friendmap