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

Content Management defect fixes