there you go
Merge branch 'master' of https://github.com/Censkh/Hiest.git

Conflicts:
	src/com/censkh/heist/listener/EntityEventListener.java