Merge branch 'develop'

* develop:
Merge branch 'develop'

* develop:
  add websockets (socket.io 1.1.0)
Merge branch 'develop'

* develop:
  update readme
rename database connection setup helper