Set Text Search Datei
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/de/dhbw/die5gewinnt/controller/logic/ModelController.java