Users management
Merge branch 'master' of https://github.com/pdsanchez/MBM