Start of user management development.
Merge branch 'dev'