Fix Klassenname
Merge branch 'development' into testing