Merge pull request #1 from aptara/Sprint-3-

Sprint 3
Merge pull request #7 from aptara/Sushil

Sushil
Merge pull request #9 from aptara/Sprint-3-

Sprint 3
Merge pull request #11 from aptara/Gauri

Gauri
Merge pull request #10 from aptara/Gauri

Defect Fix
Merge pull request #13 from aptara/Sprint-3-

Merge pull request #10 from aptara/Gauri
Content Popup changes
Added User Management Back end
Merge branch 'Sprint-4' of https://github.com/aptara/AdvantexeAdminPortal into Gauri

Conflicts:
	Web/Views/Client/ManageClient.cshtml
	Web/Views/Group/ManageGroup.cshtml