Merge branch 'master' into joniDev

...w/src/de/uniwue/mk/athen/medie/owl/view/MedIEOWLView.java

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

...then/annotationbrowserwidget/AnnotationBrowserWidget.java

...kall.athen.appDelegation/ressources/AndronScriptorWeb.ttf

...wue/mk/kall/athen/appDelegation/util/ApplicationUtil.java

...e.mk.kall.athen.goldstandardAnalyzer/META-INF/MANIFEST.MF

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

...then/part/editor/dialog/EditorAnnotationChangeDialog.java

.../athen/part/editor/dialog/ImmediateAutoCompleteField.java

...n/part/editor/dialog/MySimpleContentProposalProvider.java

...hen/part/editor/dialog/UIMAAnnotationChangeComposite.java

...e/mk/kall/athen/widget/editor/AnnotationEditorWidget.java

...mk/kall/athen/widget/editor/QuickTypeSelectionDialog.java

.../athen/projectExplorer/conversion/DocumentFormatUtil.java

...wue/mk/kall/athen/projectExplorer/conversion/EFormat.java

...rer/conversion/MedTxtToApplicationXMIFormatConverter.java

...plorer/conversion/TxtToApplicationXMIFormatConverter.java

...k/kall/athen/selection/analyzer/ui/SelectionAnalyzer.java

...w/src/de/uniwue/mk/kall/coreferenceview/ui/CorefView.java

...chos/coref/editor/drawingstructure/EditorDrawingUtil.java