Merge remote-tracking branch 'origin/master' into EventServiceTests

# Conflicts:
#	src/test/java/mops/gruppen2/service/EventServiceTest.java

src/main/java/mops/gruppen2/domain/EventDTO.java

@@ -12,4 +12,5 @@ public class EventDTO {
     Long group_id;
     String user_id;
     String event_payload;
+    boolean visibility;
 }

src/main/java/mops/gruppen2/domain/apiWrapper/UpdatedGroupRequestMapper.java

@@ -13,4 +13,4 @@ import java.util.List;
 public class UpdatedGroupRequestMapper {
     private Long status;
     private List<Group> groupList;
-}
+}

src/main/java/mops/gruppen2/domain/event/Event.java

@@ -30,6 +30,7 @@ public class Event {
     Long group_id;
     String user_id;
 
+
     public Event(Long group_id,String user_id){
         this.group_id = group_id;
         this.user_id = user_id;

src/main/java/mops/gruppen2/domain/event/UpdateRoleEvent.java

@@ -17,9 +17,10 @@ public class UpdateRoleEvent extends Event {
         super(event_id, group_id, user_id);
         this.newRole = newRole;
     }
-
+  
     public UpdateRoleEvent(Long group_id, String user_id, Role newRole) {
         super(group_id, user_id);
         this.newRole = newRole;
     }
+
 }