Merge pull request #42 from aptara/Sprint-4

Sprint 4
Content Changes
Merge branch 'Gauri' of https://github.com/aptara/AdvantexeAdminPortal into Gauri
Group  Drop down changes
Merge branch 'Sprint-5' of https://github.com/aptara/AdvantexeAdminPortal into Gauri

Conflicts:
	Advantexe.Protal.v11.suo
	ErrorLogs/Log.txt
	Web/obj/Debug/Advantexe.Admin.Portal.csproj.GenerateResource.Cache
User & Content Management Group Changes
Merge pull request #48 from aptara/Gauri

Gauri