MOBSDK-482/509: cm:content, cm:folder incl unit tests.
Merge pull request #132 from pwschmidt/master

MOBSDK-482 (Part II)