NMR Verbesserungen
Merge branch 'origin/master'

Conflicts:
	QHE/main.tex