Added Socket.io and some test codes
Merge remote-tracking branch 'origin/master'