Initiale Struktur in Enwturf erstellt
fixed merge consflicts in Entwurf added *.orig file generated by meld
fixed some merge problems