Content Management defect fixes
Merge branch 'Sprint-4' of https://github.com/aptara/AdvantexeAdminPortal into rajib

Conflicts:
	Web/Content/Styles/styles/custom.css