Rework max health values. Fixes BUKKIT-4398
Fix Entity persistence. Fixes BUKKIT-4397

Missed diff.
Regrow sheep wool on grass consumption. Resolves BUKKIT-4405
Fix world preparation status output. Fixes BUKKIT-4407
Send event-defined MOTD/maxplayers. Fixes BUKKIT-4409

Also, revert to previous CraftBukkit functionality
Update client on cancelled leash. Fixes BUKKIT-4395
Update client on cancelled entity naming. Fixes BUKKIT-4396
Added EntityHorse for diff visibility.
Fix donkey/mule dupe exploit.
Minecraft spec has changed and we're required to follow. We now build with Java 6.
Fix scaling for player health. Fixes BUKKIT-4431
Properly clear attributes on remove and death. Fixes BUKKIT-4416
Improve maps.yml. Fixes BUKKIT-4419

Additionally fixed Minecart's interface to map INVALID methods.
Merge branch 'master' of git://github.com/Bukkit/CraftBukkit into master-spigot

Conflicts:
	src/main/java/net/minecraft/server/EntityLiving.java
	src/main/java/net/minecraft/server/MinecraftServer.java
	src/main/java/net/minecraft/server/PendingConnection.java
	src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
Merge branch 'master-spigot' into 1.6-spigot