adminy things
Merge branch 'master' of https://github.com/edroque93/PHPpr6
admin users
Merge branch 'master' of https://github.com/edroque93/PHPpr6