Merge branch 'master' into latex_doc_felix
Finished Architektur.
Working on Diskussion.
Merge branch 'latex_doc_felix'