Preparing for release

Solving conflicts.
Set constants to GMS-like. Ready for release.

src/net/server/Server.java

@@ -365,7 +365,7 @@ public class Server implements Runnable {
     }
 
     public static void main(String args[]) {
-	System.setProperty("wzpath", "wz");
+        System.setProperty("wzpath", "wz");
         Server.getInstance().run();
     }