Defect fix
Defect Fixes
Defect Fix
Merge branch 'Sprint-4' of https://github.com/aptara/AdvantexeAdminPortal into Gauri

Conflicts:
	Web/Views/Client/ManageClient.cshtml
	Web/Views/Group/ManageGroup.cshtml
user Management UI & functionality
User Management Group
User Management Functionlity
all Changes
User Management Changes
Merge pull request #14 from aptara/Gauri

Gauri
Merge pull request #15 from aptara/master

Merge from master