Merge branch 'integrate_voting'
akteurdiagramm hinzugefügt
renamed intern_files to internal_files
Merge branch 'master' into integrate_voting