f49 last, unimportant changes
Merge branch 'f49' of https://github.com/catmadevel/catma into f49

Conflicts:
	src/de/catma/ui/tagger/TaggerView.java