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'