Fixed health stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/to/uk/ilexiconn/jurassicraft/data/entity/dinos.json