Entity Player needed to extend EntityLivingBase instead of Entity (API Only)
Merge remote-tracking branch 'origin/master'

Conflicts:
	GraniteAPI/src/main/java/org/granitemc/granite/api/entity/EntityLivingBase.java
	GraniteAPI/src/main/java/org/granitemc/granite/api/entity/player/Player.java
Entity Player needed to extend EntityLivingBase instead of Entity (API Only)