Labels editierbar
Merge branch 'labeledit'