content feature
added enhancements
prototype
fixed merge conflict
release notes
fixed merge problems
Merge branch 'master' into r2_contacts
release notes added, feature finished
merge conflicts solved