full functionality for user management.
Merge pull request #80 from Align/matt-dev

full functionality for user management.