Merge branch 'opPROX' of ssh://korap.ids-mannheim.de:29418/KorAP/Koral into opPROX

Change-Id: I4a066545ecdf4fd73463453b0a36e66421773d76