Renamed contentType to resourceSubType
Merge branch 'master' into issue-413
Renamed document to collabdoc
Some more renaming to resourceSubType
Merge pull request #421 from nicolaasmatthijs/issue-413

Renamed contentType to resourceSubType