Merge branch 'content-include-groups' into 'master'

Include ContentGroups when retrieving Contents from service

Closes #30 and #29

See merge request !106

src/main/java/de/thm/arsnova/service/ContentServiceImpl.java

@@ -91,6 +91,10 @@ public class ContentServiceImpl extends DefaultEntityServiceImpl<Content> implem
 			}
 			//content.setSessionKeyword(roomRepository.getSessionFromId(content.getRoomId()).getKeyword());
 
+			Room room = roomRepository.findOne(content.getRoomId());
+			content.setGroups(room.getContentGroups().stream()
+					.map(Room.ContentGroup::getName).collect(Collectors.toSet()));
+
 			return content;
 		} catch (final DocumentNotFoundException e) {
 			logger.error("Could not get content {}.", id, e);