remove mention of websocket-server, css-build.sh
Merge branch 'master' into xmpp