Tracking users in socket handler, passing on join
Merge branch 'bugs/avatars-missing-53121735' into development