Add scale health display API. Adds BUKKIT-4432
Merge branch 'master' of https://github.com/Bukkit/Bukkit into master-spigot

Conflicts:
	src/main/java/org/bukkit/entity/Player.java
Merge branch 'master-spigot' into 1.6-spigot