Merge remote-tracking branch 'origin/master' into redeWiedergabe_dev

...k/athen/textwidget/widget/ATHENEditorBorderComposite.java

.../uniwue/mk/athen/textwidget/widget/ATHENEditorWidget.java

...athen/annotationbrowserview/ui/AnnotationBrowserView.java

...then/annotationbrowserwidget/AnnotationBrowserWidget.java

...then/annotationbrowserwidget/AnnotationFeatureFilter.java

...k.kall.athen.appDelegation/ressources/corefViewConfig.xml

...kall/athen/depparse/analyzer/DependencyParseAnalyzer.java

.../uniwue/mk/kall/athen/events/IAnnotationEditorEvents.java

...kall/athen/goldstandardAnalyzer/GoldstandardAnalyzer.java

.../mk/kall/athen/goldstandardAnalyzer/struct/NAryTupel.java

...ndardAnalyzer/ui/GoldstandardAnalyzerDrawingStrategy.java

...n/goldstandardAnalyzer/util/AnnotationComparisonUtil.java

...ndardAnalyzer/widgets/GoldStandardTreeTableComposite.java

...en/bundles/de.uniwue.mk.kall.athen.part.editor/.classpath

.../de.uniwue.mk.kall.athen.part.editor/META-INF/MANIFEST.MF

...dles/de.uniwue.mk.kall.athen.part.editor/build.properties

...ue.mk.nappi.core-0.0.1-SNAPSHOT-jar-with-dependencies.jar

...uniwue/mk/kall/athen/part/editor/MainCharacterFilter.java

...uniwue/mk/kall/athen/part/editor/dialog/SearchDialog.java

...mk/kall/athen/part/editor/dialog/StyleChangingDialog.java