Merge pull request #250 from aptara/rajib

Rajib
Fix issues
Merge branch 'Sprint-5' of https://github.com/aptara/AdvantexeAdminPortal into rajib

Conflicts:
	Web/Resource/AdvantexeResource.resx