Session Expire Cshtml added
Content Changes
Commit Content error changes
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
Admin Home page changes
User & Content Management Changes
Content Cs Change for Regular Expression
Merge pull request #40 from aptara/Gauri

Gauri
Content upload changes
Merge pull request #41 from aptara/Sushil

Sushil
Merge Rajib CSS change to Sprint 4
Merge branch 'Sprint-4' of https://github.com/aptara/AdvantexeAdminPortal into rajib

Conflicts:
	Advantexe.Protal.v11.suo
	ErrorLogs/Log.txt
	Web/Views/Admin/AdminHome.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