Merged Betware/bukkitgui2:master with Spideynn/bukkitgui2:master. Again.