Websocket protocol
Fixed websockets
Merge branch 'ws'

* ws:
  Fixed websockets
  Websocket protocol