Display the correct avatars
Add pagination to admin/users page
Merge branch 'feature/frontend' into develop