rename entity
Merge branch '2.0.0-1.6.4DEV' of https://SmeagolWOrms4@github.com/GollumTeam/GollumCoreLib.git into 2.0.0-1.7.2DEV

Conflicts:
	src/main/java/mods/gollum/core/common/tileentities/TileEntityBlockSpawner.java
	src/minecraft/mods/gollum/core/common/tileentities/TileEntityBlockProximitySpawn.java
	src/minecraft/mods/gollum/core/common/tileentities/TileEntityBlockSpawner.java