Merge pull request #206 from aptara/Sushil

Sushil
Merge pull request #208 from aptara/Sushil

merge issue
Merge pull request #210 from aptara/Sushil

Defect fixes
Merge pull request #212 from aptara/Sushil

Added png
Defect Fixes for Content
Merge branch 'Sprint-5' of https://github.com/aptara/AdvantexeAdminPortal into Gauri

Conflicts:
	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/Shared/_ReportLayout.cshtml
	Web/Views/Shared/_UserLayout.cshtml
	Web/Views/User/ManageUser.cshtml
	Web/Views/UserDashboard/UserDashboard.cshtml
css changes done
custom.css commited again
Merge pull request #214 from aptara/rajib

Rajib
Merge pull request #216 from aptara/Sushil

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

Conflicts:
	Web/Content/Styles/styles/custom.css
Merge pull request #218 from aptara/Gauri

Gauri
css merge issue
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