Fix the Trim issue
Merge branch 'Sprint-5' of https://github.com/aptara/AdvantexeAdminPortal into Sushil

Conflicts:
	Web/obj/Debug/Advantexe.Admin.Portal.dll
	Web/obj/Debug/Advantexe.Admin.Portal.pdb
	Web/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Merge pull request #57 from aptara/Sushil

Sushil
Merge pull request #58 from aptara/Sprint-5

Sprint 5