Text korrigiert
Merge branch 'devel' into releasecandidate2