Commit für Pull
Merge branch 'master' of https://github.com/lfuelling/textie

Conflicts:
	src/de/micromata/azubi/Raum.java
Merge branch 'master' of https://github.com/lfuelling/textie

Conflicts:
	src/de/micromata/azubi/Raum.java