COMMIT
Merge branch 'master' of https://github.com/Censkh/Hiest

Conflicts:
	src/com/censkh/heist/packetentity/PacketEntityManager.java
Merge branch 'master' of https://github.com/Censkh/Hiest
Edited