Merge branch 'master' of https://git.tk.informatik.tu-darmstadt.de/scm-ssi-student-hostagev2

src/de/tudarmstadt/informatik/hostage/net/MyServerSocketFactory.java

@@ -11,7 +11,7 @@ import java.net.SocketImpl;
 import javax.net.ServerSocketFactory;
 
 import de.tudarmstadt.informatik.hostage.system.P;
-import de.tudarmstadt.informatik.hostage.ui.MainActivity;
+import de.tudarmstadt.informatik.hostage.ui2.activity.MainActivity;
 
 /**
  * Server Socket Factory using file descriptors.