Fixing socket.io => socket.io-client
fixing symlink
Merge remote-tracking branch 'base-project/master'