Merge pull request #235 from aptara/Sprint-5

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

Conflicts:
	ErrorLogs/Log.txt
	Web/Advantexe.Admin.Portal.csproj
Defect Fixes
Merge branch 'Sprint-5' of https://github.com/aptara/AdvantexeAdminPortal into Gauri

Conflicts:
	Web/Views/UserDashboard/UserProfile.cshtml
Merge pull request #240 from aptara/Gauri

Gauri