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

Conflicts:
	Web/Content/Styles/styles/custom.css
CSS Changes done
Merge pull request #35 from aptara/rajib

Rajib
Merge pull request #36 from aptara/Gauri

Gauri
Content validations
Merge pull request #38 from aptara/Sushil

Content validations
User dashboard issues
Merge pull request #39 from aptara/Sushil

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

Conflicts:
	Advantexe.Protal.v11.suo
	ErrorLogs/Log.txt
	Web/Models/Content.cs
	Web/Views/Shared/EditorTemplates/ContentPopup.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
	Web/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache