Merge pull request #222 from aptara/rajib

Rajib
Merge pull request #224 from aptara/rajib

css changes commited
Admin Profile Added
Admin Profile Page added
Merge branch 'Gauri' of https://github.com/aptara/AdvantexeAdminPortal into Gauri
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
Merge pull request #232 from aptara/rajib

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

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

Sprint 5
Error handling
added missing files
Merge branch 'Sushil' of https://github.com/aptara/AdvantexeAdminPortal into Sushil
e
Merge pull request #236 from aptara/Sushil

Sushil
Content Fixes