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

Conflicts:
	resources/res/tiles/list
	src/rogue/Rogue.java
Merge branch 'experimental' of https://github.com/luetge/der-pazifist into experimental

Conflicts:
	resources/res/tiles/list
	src/rogue/Rogue.java