Merge branch 'develop'
bug fix
Merge branch 'master' of https://github.com/knowledgecode/WebSocket-for-Android
Merge branch 'develop'
Merge branch 'develop'
add syntax highlight
Merge branch 'master' into develop