Merge origin/master

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

src/netz/Start.java

@@ -19,7 +19,7 @@ import netz.view.ChatView;
 
 /**
  * Builder Class
- * @author le
+ * @author chris, hd
  */
 public class Start
 {
@@ -61,7 +61,7 @@ public class Start
     
   }
 
-  public static void main() 
+  public static void main(String[] args) 
   {
     try
     {