token authentication
fix
Merge branch 'users' into socket.io