updated to craftbukkit 1.5 (pre)
merge from upstream
fix used cb version