kleine Anpassungen
Merge remote-tracking branch 'origin/master'

Conflicts:
	IDPA2012_Document/hauptteil/deltawerke/deltawerke.tex
bild
Merge remote-tracking branch 'origin/master'