public marks

PUBLIC MARKS from bamthomas with tags developpement & Websocket