Update socket.io version
Fix pubsub sample
Merge branch 'master' into dev