Merge branch 'master' into latex_doc_felix
Working on stuff.
Architektur.
Architektur and renamed a class.
Merge branch 'latex_doc_felix'