merge sprint3
updated css changes
done
Merge branch 'Sprint-4' of https://github.com/aptara/AdvantexeAdminPortal into rajib

Conflicts:
	Advantexe.Protal.v11.suo
	ErrorLogs/Log.txt
	Web/Advantexe.Admin.Portal.csproj
	Web/Content/Styles/styles/custom.css
	Web/Data/AdvantexeDataModel.Context.cs
	Web/Data/AdvantexeDataModel.Designer.cs
	Web/bin/Advantexe.Admin.Portal.dll
	Web/bin/Advantexe.Admin.Portal.pdb
hggyfhth
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
new image
Three new images
done css
done
Merge branch 'Sprint-4' of https://github.com/aptara/AdvantexeAdminPortal into rajib

Conflicts:
	Advantexe.Protal.v11.suo
	ErrorLogs/Log.txt
	ErrorLogs/Log.txt20131209
	Web/Resource/AdvantexeResource1.Designer.cs
	Web/Views/AdvantexeAccount/Login.cshtml
	Web/Views/Shared/_Layout.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.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
Changes done on following files
Merge branch 'Sprint-4' of https://github.com/aptara/AdvantexeAdminPortal into rajib

Conflicts:
	Advantexe.Protal.v11.suo
	ErrorLogs/Log.txt
	Web/Resource/AdvantexeResource1.Designer.cs
	Web/Views/Client/ManageClient.cshtml
	Web/bin/Advantexe.Admin.Portal.dll
	Web/bin/Advantexe.Admin.Portal.pdb
	Web/obj/Debug/Advantexe.Admin.Portal.Resource.AdvantexeResource.resources
	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/edmxResourcesToEmbed/Data/AdvantexeDataModel.csdl
	Web/obj/Debug/edmxResourcesToEmbed/Data/AdvantexeDataModel.msl
	Web/obj/Debug/edmxResourcesToEmbed/Data/AdvantexeDataModel.ssdl
done css
Merge pull request #20 from aptara/rajib

Rajib
Merge branch 'Sprint-4' of https://github.com/aptara/AdvantexeAdminPortal into Gauri

Conflicts:
	Advantexe.Protal.v11.suo
	ErrorLogs/Log.txt
	Web/Views/Content/ManageContents.cshtml
	Web/Views/Group/ManageGroup.cshtml
	Web/Views/User/ManageUser.cshtml
	Web/bin/Advantexe.Admin.Portal.dll
	Web/bin/Advantexe.Admin.Portal.pdb
	Web/obj/Debug/Advantexe.Admin.Portal.Resource.AdvantexeResource.resources
	Web/obj/Debug/Advantexe.Admin.Portal.csproj.FileListAbsolute.txt
	Web/obj/Debug/Advantexe.Admin.Portal.csproj.GenerateResource.Cache
	Web/obj/Debug/Advantexe.Admin.Portal.dll
	Web/obj/Debug/Advantexe.Admin.Portal.pdb
	Web/obj/Debug/edmxResourcesToEmbed/Data/AdvantexeDataModel.csdl
	Web/obj/Debug/edmxResourcesToEmbed/Data/AdvantexeDataModel.msl
	Web/obj/Debug/edmxResourcesToEmbed/Data/AdvantexeDataModel.ssdl