for merge
Merge branch 'master' of https://github.com/laike9m/FBT
for merge
Merge branch 'master' of https://github.com/laike9m/FBT
add logic about friend and shuoshuo and websocket
Merge branch 'master' of https://github.com/laike9m/FBT