Gauri

Merging user management changes from Gauri to Sprint 4 branch