Online users feature added
Removing buggy file
Merge branch 'develop' into staging