Count all users, not only in page
Merge branch 'feature/additions_and_annotations' into staging