upgrade to socket.io 1.1.0
Merge branch 'develop'

* develop:
  upgrade to socket.io 1.1.0