Setup server listeners for connecting/disconnecting users
Merge origin/master