* Refactored users list to be easier to read and a lot less flimsy
Merge branch 'develop' into feature/technicallyerik-wip