no message
Merge branch 'master' of https://github.com/Blackdread/Drol2013

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