Merge branch 'master' of github:jklmnn/KinderVerwaltung

Merging with github.
Merge branch 'master' of github:jklmnn/KinderVerwaltung