test
test
defect
test
teste
Css
Merge branch 'Sprint-3-' of https://github.com/aptara/AdvantexeAdminPortal into Gauri

Conflicts:
	Advantexe.Protal.v11.suo
	ErrorLogs/Log.txt
	Web/Advantexe.Admin.Portal.csproj
	Web/Data/AdvantexeDataModel.Context.cs
	Web/Data/AdvantexeDataModel.Designer.cs
	Web/Data/AdvantexeDataModel.edmx
	Web/Data/AdvantexeDataModel.edmx.diagram
	Web/Data/Business/ClientManager.cs
	Web/Data/Business/GroupManager.cs
	Web/Data/Client.cs
	Web/Data/Content.cs
	Web/Data/GetAllGroupsForClient_Result.cs
	Web/Models/Client.cs
	Web/Models/Group.cs
	Web/Models/User.cs
	Web/Views/Client/ManageClient.cshtml
	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.csprojResolveAssemblyReference.cache
	Web/obj/Debug/Advantexe.Admin.Portal.dll
	Web/obj/Debug/Advantexe.Admin.Portal.pdb
	Web/obj/Debug/DesignTimeResolveAssemblyReferences.cache
	Web/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Web/obj/Debug/TempPE/Data.AdvantexeDataModel.Designer.cs.dll
	Web/obj/Debug/TempPE/Data.AdvantexeDataModel.cs.dll
	Web/obj/Debug/edmxResourcesToEmbed/Data/AdvantexeDataModel.csdl
	Web/obj/Debug/edmxResourcesToEmbed/Data/AdvantexeDataModel.msl
	Web/obj/Debug/edmxResourcesToEmbed/Data/AdvantexeDataModel.ssdl
Group Grid & Defect Fix