CONN-1377 Manage users, display user list and delete
CONN-1377 Merge Conflict
Merge pull request #938 from jsmith2/CONN-1377

CONN-1377 Manage users, display user list and delete