Merge pull request #218 from aptara/Gauri

Gauri
Merge pull request #220 from aptara/Gauri

css merge issue
css changes
Merge branch 'Sprint-5' of https://github.com/aptara/AdvantexeAdminPortal into rajib

Conflicts:
	Advantexe.Protal.v11.suo
	ErrorLogs/Log.txt
	Web/Web.config
	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.dll
	Web/obj/Debug/Advantexe.Admin.Portal.pdb
	Web/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Merge pull request #222 from aptara/rajib

Rajib
css changes commited
Merge pull request #224 from aptara/rajib

css changes commited
Error handling changes
Merge pull request #226 from aptara/Gauri

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

Conflicts:
	Web/Controllers/Admin/AdminController.cs
	Web/Views/AdvantexeReport/ClientGroupReport.cshtml
	Web/Views/AdvantexeReport/_ClientReportChart.cshtml
	Web/Views/Client/ManageClient.cshtml
	Web/Views/Content/ManageContents.cshtml
	Web/Views/Group/ManageGroup.cshtml
	Web/Views/User/ManageUser.cshtml
	Web/Views/UserDashboard/UserProfile.cshtml
Merge pull request #228 from aptara/Sushil

Sushil
Resolve the merge conflicts
Merge pull request #230 from aptara/Sushil

Resolve the merge conflicts
CSS Commited
CSS COMIT
Merge pull request #232 from aptara/rajib

Rajib
Merge pull request #235 from aptara/Sprint-5

Sprint 5