websocket chat
Merge branch 'feature/socket'