Include ContentGroups when retrieving Contents from service Closes #30 and #29 See merge request !106