Fixed online users panel
Merge remote-tracking branch 'upstream/master'
merged with user panel fixed