Merge branch 'master' of https://github.com/knowledgecode/WebSocket-for-Android