Merge branch 'master' into latex_doc_felix
Motivation and Diskussion.
Merge branch 'latex_doc_felix'
Merge branch 'LaTeX_documentation_holzi'

Conflicts:
	doc/LaTeX/IS_Projekt.tex
Resolve merge conflict.
Merge branch 'master' into LaTeX_documentation_holzi