Merge remote-tracking branch 'origin/develop' into f/groups

Conflicts:
	src/main/java/envoy/server/data/User.java
	src/main/java/envoy/server/processors/IDGeneratorRequestProcessor.java
	src/main/java/envoy/server/processors/MessageProcessor.java

src/main/java/envoy/server/data/User.java

@@ -5,7 +5,6 @@ import java.util.List;
 
 import javax.persistence.*;
 
-
 /**
  * This class serves as a way to let Hibernate communicate with the server
  * without bringing the dependency of JPA/Hibernate into the client.<br>
@@ -33,7 +32,7 @@ import javax.persistence.*;
 )
 public class User extends Contact {
 
-	private byte[]	passwordHash;
+	private byte[] passwordHash;
 
 	@Temporal(TemporalType.TIMESTAMP)
 	private Date						lastSeen;

src/main/java/envoy/server/processors/IDGeneratorRequestProcessor.java

@@ -28,7 +28,6 @@ public class IDGeneratorRequestProcessor implements ObjectProcessor<IDGeneratorR
 	public void process(IDGeneratorRequest input, long socketId, ObjectWriteProxy writeProxy) throws IOException {
 		System.out.println("Received id generation request.");
 		var generator = createIDGenerator();
-
 		System.out.println("Sending new id generator " + generator);
 		writeProxy.write(socketId, generator);
 	}

src/main/java/envoy/server/processors/MessageProcessor.java

@@ -27,7 +27,6 @@ public class MessageProcessor implements ObjectProcessor<Message> {
 
 	@Override
 	public void process(Message message, long socketId, ObjectWriteProxy writeProxy) {
-
 		message.nextStatus();
 		ConnectionManager	connectionManager	= ConnectionManager.getInstance();
 		Contact				recipient			= PersistenceManager.getInstance().getContactById(message.getID());