Merge branch 'dev-webconsole' into dev-zond-recode

# Conflicts:
#	build.gradle

bridge/build.gradle

@@ -17,11 +17,10 @@ configurations {
 }
 
 compileJava {
-    dependsOn ':bridge-protocol:compileJava'
+    dependsOn ':libprotocol:compileJava'
 }
 
 jar {
-    dependsOn ':bridge-protocol:jar'
     dependsOn configurations.include
     from { configurations.include.collect { it.isDirectory() ? it : zipTree(it) } }
 }
@@ -31,7 +30,7 @@ ext {
 }
 
 dependencies {
-    include files(project(':bridge-protocol').sourceSets.main.output.classesDir)
+    include files(project(':libprotocol').sourceSets.main.output.classesDir)
     compile (group: 'org.bukkit', name: 'bukkit', version: '1.8.8-R0.1-SNAPSHOT') {
         exclude group: 'junit'
         exclude group: 'commons-lang'

build.gradle

@@ -13,7 +13,7 @@ subprojects {
 }
 
 subprojects {
-    if (!it.name.startsWith('bridge') && !it.name.startsWith('zond')) {
+    if (it.name != 'bridge' && it.name != 'zond' && !it.name.startsWith('lib')) {
         ext {
             slf4jVersion = '1.7.21'
         }

mcserver-manager/build.gradle

@@ -9,7 +9,7 @@ configurations {
 }
 
 compileJava {
-    dependsOn ':bridge-protocol:compileJava'
+    dependsOn ':libprotocol:compileJava'
 }
 
 jar {
@@ -35,7 +35,7 @@ ext {
 dependencies {
     compile project(':core')
     compile project(':webinterface')
-    include files(project(':bridge-protocol').sourceSets.main.output.classesDir)
+    include files(project(':libprotocol').sourceSets.main.output.classesDir)
     compile group: 'io.netty', name: 'netty-codec', version: nettyVersion
     compile group: 'io.netty', name: 'netty-codec-http', version: nettyVersion
 }

settings.gradle

@@ -2,6 +2,6 @@ rootProject.name = 'asys'
 include 'core'
 include 'webinterface'
 include 'mcserver-manager'
-include 'bridge-protocol'
+include 'libprotocol'
 include 'bridge'
 include 'zond'