Merge remote-tracking branch 'origin/master' into HEAD

Conflicts:
	Pflichtenheft/Pflichtenheft.tex
	Pflichtenheft/Pflichtenheft.toc