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
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