websocketserver: First attempt at a websocket server
websockets: bug fixing on web socket server
Merge branch 'websocketserver'