1)merge with upstream master multi module build 2)deleted outdated src dir

src/main/java/org/jboss/netty/util/Version.java

@@ -1,13 +0,0 @@
-// DO NOT MODIFY - WILL BE OVERWRITTEN DURING THE BUILD PROCESS
-package org.jboss.netty.util;
-/**
- * Provides the version information of Netty.
- * @apiviz.landmark
- */
-public final class Version {
- /** The version identifier. */
- public static final String ID = "4.0.0.Alpha1-SNAPSHOT-f62bb85";
- /** Prints out the version identifier to stdout. */
- public static void main(String[] args) { System.out.println(ID); }
- private Version() { super(); }
-}