Refactor users, add sorting and find
merge and fix conflicts
Merge branch 'master' of https://github.com/Inostudio/php-prototype