Add listen to client events
Merge branch 'master' of github.com:Sangraama/sangraama-server