Content Defect Fixes
Merge pull request #255 from aptara/rajib

Fixed the merge issue
Fixed report user dashboard function issues found in review
Merge branch 'Sprint-5' of https://github.com/aptara/AdvantexeAdminPortal into Gauri

Conflicts:
	Web/Content/Styles/js/custom.js
Some More changes
Merge pull request #258 from aptara/Gauri

Gauri
Login.cshtml file edited.