corrected "login" to "join" and "logout" to "leave"
Merge branch 'master' into wamp_tmp
n/a