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

Conflicts:
	Web/Web.config
	Web/bin/Advantexe.Admin.Portal.dll
	Web/bin/Advantexe.Admin.Portal.pdb
Merge pull request #176 from aptara/Gauri

Gauri
Merge pull request #177 from aptara/Sprint-5

Sprint 5