Merge pull request #612 from Lellansin/master

close http server after WebSocketServer.close
Update timeout.js
Merge pull request #613 from gitig/patch-3

Update timeout.js
Merge pull request #614 from Lellansin/master

fix typos
upgrade pomelo to 1.1.0

Change-Id: I43bf8c61897c5eb2e767e4809e7ea9b96befc1c6
Upgrade pomelo-protocol to 0.1.4
Merge pull request #616 from zxc122333/patch-2

Upgrade pomelo-protocol to 0.1.4
Merge pull request #1 from NetEase/master

Merge