Partially reverts changes of 9d0255e7. Added helper methods to Room which transform the ContentGroup collection from Set to Map. Content IDs are now removed from groups when Contents are deleted.