Content Management defect fixes
Merge pull request #34 from aptara/Sprint-4

Content Management defect fixes