work in progress
Merge branch 'master' into contentmetadata
work in progress
refactors helper methods and adds contentMetadata display test
Merge branch 'master' into contentmetadata
Merge branch 'master' into contentmetadata
closes #154