Merge branch '4.0' of https://github.com/Bl0bber/textie into Bl0bber-4.0

Conflicts:
	src/main/java/de/micromata/azubi/model/Dungeon.java
	src/test/java/test/de/micromata/azubi/TextieTest.java