Merge pull request #1 from JamesonHuang/master

merge
websocket demo

android客户端+webscoket+java服务器，信息交互测试。
Revert "websocket demo"

This reverts commit 018259f6f777b21a7083687d1d5a44556c679da2.
websocketDemo

android客户端+websocket+java服务器，信息交互测试。
Merge pull request #1 from nashse/master

websocket demo