Changes

Summary

1. More conflict resolution. (details)

Commit b73910a7b7dbc45e5b493b988201c8ba8a8de66f by md_5 (md_5) More conflict resolution.
	CraftBukkit-Patches/0152-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch
	CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch