Todo's and corrections
Merge remote-tracking branch 'origin/master'

Conflicts:
	report/master_doc.tex