Implement tokens for socket.io
Incorporate merge conflicts