no message
Merge commit 'd0293ffa1f7529e8320e5be347c8f390e161ff11'

Conflicts:
	src/base/engine/entities/BasicEntity.java
	src/base/engine/entities/HeroEntity.java