fixes #80
Merge branch '4.0' of https://github.com/lfuelling/textie into 4.0

Conflicts:
	src/main/java/de/micromata/azubi/Dungeon.java
	src/main/java/de/micromata/azubi/StorageItem.java