Luis off-branch changes
Merge branch 'luis-premerge'

Conflicts:
	Loesung5.tex