Merge branch 'flexjson'

Conflicts:
	src/main/java/de/micromata/azubi/Dungeon.java
	src/main/java/de/micromata/azubi/Item.java
	src/main/java/de/micromata/azubi/Karte.java
	src/main/java/de/micromata/azubi/Raum.java
Merge branch 'master' of github.com:lfuelling/textie

Conflicts:
	src/main/java/de/micromata/azubi/Dungeon.java
	textie.iml