Merge remote-tracking branch 'origin/master' into playground
Merge.
Merge remote-tracking branch 'origin/master' into playground

Conflicts:
	src/main/java/org/bukkit/plugin/SimplePluginManager.java
Merge remote-tracking branch 'origin/master' into playground

Conflicts:
	src/main/java/org/bukkit/plugin/SimplePluginManager.java
Begin work on Canary -> Surge port.
Push O* classes.
Event system port started.
Almost done port: work on transfering etc class
Add net.minecraft.server.Item for diff visibility
My progress with the Canary port, still a lot to be done
More progress, I'm not too sure about the rest of the issues.
Merge branch 'master' into canary
Some more changes to Canary support
Work on SurgePluginManager.
Pretty much finished!
Java 7 plugins run on Java 5-6 servers!
Update JBL.
Update JBL.
Fix JBL blooper
Move Canary to its own package.