resillience

Implemented the stuff right away we were talking about today :-)
prolbem
Merge remote-tracking branch 'origin/master'

Conflicts:
	doc/latex/reportTemplate.pdf