Error handling changes
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
Merge pull request #229 from aptara/Sprint-5

Sprint 5