Merge websocket demo into web demo