Update CraftBukkit to Minecraft 1.7.10
Put damage modifiers in Functions for event. Fixes BUKKIT-5681
Add files for diff
Implement Merchant Trade API - Adds BUKKIT-5663
Remove unecessary should be comment.