Template change: renamed top chapters
merge
Template change: acknowledgment -> danksagung
Merge branch 'master' into bachelor