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

Conflicts:
	src/de/catma/ui/tagger/TaggerView.java
f104 combo box

functionality is not completely in place
f104 combo box implemented
Merge branch 'issue-104' of https://github.com/catmadevel/catma into catma-devel-issue-104

Conflicts:
	src/de/catma/ui/tagger/PropertyEditDialog.java
	src/de/catma/ui/tagger/TagInstanceTree.java