done changes
changes done
Merge pull request #33 from aptara/Sprint-4

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

Conflicts:
	Web/Content/Styles/styles/custom.css
CSS Changes done
Merge pull request #35 from aptara/rajib

Rajib
Merge pull request #36 from aptara/Gauri

Gauri
Merge pull request #37 from aptara/Sprint-4

Sprint 4