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

Conflicts:
	Web/Data/Business/UserManager.cs
	Web/obj/Debug/Advantexe.Admin.Portal.csproj.FileListAbsolute.txt
Content Management defect fixes
Merge pull request #59 from aptara/Gauri

Gauri