Merge active and away lists, add a status indicator and sort users by name and status
Merge pull request #712 from alfhenrik/user-list-declutter

User list declutter, part 1