ß verbessert
Merge branch 'master' of https://github.com/Knorke/de.htwg.wzzrd.git

Conflicts:
	test/de/htwg/wzzrd/ui/TextUserInterfaceTest.java
Merge branch 'master' of https://github.com/Knorke/de.htwg.wzzrd.git