Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module

Conflicts:
	Dozentenmodul/src/GUI/SearchImage_GUI.java
	Dozentenmodul/src/Models/person.java
	Dozentenmodul/src/Models/vm.java

1 files changed, 3 insertions, 2 deletions

diff --git a/Dozentenmodulserver/src/server/startServer.java b/Dozentenmodulserver/src/server/startServer.java
index 46b9a2f1..e1ab22c0 100644
--- a/Dozentenmodulserver/src/server/startServer.java
+++ b/Dozentenmodulserver/src/server/startServer.java
@@ -1,6 +1,7 @@
 package server;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 import org.apache.log4j.BasicConfigurator;
@@ -22,7 +23,7 @@ public class startServer {
 	
 	public static void main(String[] args) {
 		BasicConfigurator.configure();
-		log.info( "Starting Application" );
+		log.info( new Date() + " - starting Application\n" );
 		Thread t;
 		t = new Thread(new BinaryListener());
 		servers.add(t);
@@ -41,7 +42,7 @@ public class startServer {
 				}
 			}
 		}
-		log.info( "All Servers shut down, exiting..." );
+		log.info( new Date()+" - all Servers shut down, exiting...\n" );
 
 	}