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
Merge branch 'Gauri' of https://github.com/aptara/AdvantexeAdminPortal into rajib

Conflicts:
	ErrorLogs/Log.txt
	Web/Content/dropit.css
	Web/bin/Advantexe.Admin.Portal.dll
	Web/bin/Advantexe.Admin.Portal.pdb
	Web/obj/Debug/Advantexe.Admin.Portal.csproj.FileListAbsolute.txt
	Web/obj/Debug/Advantexe.Admin.Portal.csproj.GenerateResource.Cache
	Web/obj/Debug/Advantexe.Admin.Portal.csprojResolveAssemblyReference.cache
	Web/obj/Debug/Advantexe.Admin.Portal.dll
	Web/obj/Debug/Advantexe.Admin.Portal.pdb
	Web/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Web/obj/Debug/edmxResourcesToEmbed/Data/AdvantexeDataModel.csdl
	Web/obj/Debug/edmxResourcesToEmbed/Data/AdvantexeDataModel.msl
	Web/obj/Debug/edmxResourcesToEmbed/Data/AdvantexeDataModel.ssdl