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

Conflicts:
	Web/Content/Styles/styles/custom.css
Merge pull request #108 from aptara/Gauri

Gauri