Merge
Merge pull request #100 from aptara/Sushil

Merge
Defect fixed
Merge pull request #102 from aptara/Sushil

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

Conflicts:
	Web/Data/Business/GroupManager.cs
	Web/Web.config