Merge pull request #26 from aptara/Sprint-4

Sprint 4
Merge pull request #28 from aptara/Sprint-4

Added missing files
Merge pull request #31 from aptara/Sprint-4

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

Content Management defect fixes
Merge pull request #36 from aptara/Gauri

Gauri