..
Latest dev build from bukkit
Latest dev build of bukkit
Resolve conflicts