jokesteller
Merge branch 'experimental' of https://github.com/luetge/der-pazifist into experimental

Conflicts:
	src/jade/core/World.java
	src/rogue/creature/DestructibleObject.java