Websocket

Closed username-removed-535549 requested to merge websocket into master