Rechtschreibung
Merge remote-tracking branch 'origin/master'

Conflicts:
	doc/doc/produktbeschreibung_funktion.tex
	doc/doc/risk_allg.tex
Merge branch 'master' of https://github.com/pren-t27/pren1