Admin: user sorting
Merge branch 'sorting-users-in-admin' into 'master'

Sorting users in admin

See merge request !1170