Merge origin/master

Conflicts:
	src/wuerfelthreads/Start.java
	src/wuerfelthreads/view/WuerfelView.form
	src/wuerfelthreads/view/WuerfelView.java

src/netz/view2/ChatView.java

@@ -3,7 +3,9 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package netz.view;
+package netz.view2;
+
+import netz.view.*;
 
 /**
  *
@@ -113,7 +115,7 @@ public class ChatView extends javax.swing.JFrame
     setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE);
     setTitle("ChatTool");
 
-    jPanel1.setLayout(new java.awt.GridLayout());
+    jPanel1.setLayout(new java.awt.GridLayout(1, 0));
 
     lblType.setText("Client");
     jPanel1.add(lblType);
@@ -177,6 +179,8 @@ public class ChatView extends javax.swing.JFrame
     }
     //</editor-fold>
     //</editor-fold>
+    //</editor-fold>
+    //</editor-fold>
 
     /* Create and display the form */
     java.awt.EventQueue.invokeLater(new Runnable()

src/ohmlogger/OhmLogger.properties

@@ -0,0 +1,4 @@
+#Level
+LOG_LEVEL=INFO
+#Log-Datei
+LOG_DATEI=../logOHM.txt

src/ohmlogger/logger.properties

@@ -0,0 +1,4 @@
+#Level
+LOG_LEVEL=ALL
+#Log-Datei
+LOG_DATEI=