Merge branch 'development' into 'DataBase'

# Conflicts:
#   src/main/java/module-info.java

src/main/java/de/hdm_stuttgart/battlearena/Model/Multiplayer/Server.java

@@ -27,8 +27,8 @@ public class Server {
     private boolean started = false;
     private static String ipaddress = "localhost";
 
-
-   /* public static void main(String[] args) throws IOException { //main method for testing purposes
+//Uncomment these lines to test the server starting manually:
+  /*  public static void main(String[] args) throws IOException { //main method for testing purposes
         Server server = new Server();
         log.info("server starting...");
         server.start(ipaddress, 4444);
@@ -38,7 +38,7 @@ public class Server {
      public void startServer() throws IOException {
         Server server = new Server();
         log.info("server starting...");
-        server.start("localhost",4444);
+        server.start(ipaddress,4444);
     }
 
     public void start(String host_ip, int port) throws IOException {