Merge branch 'faulttolerance' into resilience_hard_faults

# Conflicts:
#	examples/fault_tolerance/ADVECTION_residuals_allstrategies.png
#	examples/fault_tolerance/ADVECTION_steps_vs_iteration_hf_7x7_INTERP.png
#	examples/fault_tolerance/ADVECTION_steps_vs_iteration_hf_7x7_INTERP_PREDICT.png
#	examples/fault_tolerance/ADVECTION_steps_vs_iteration_hf_7x7_NOFAULT.png
#	examples/fault_tolerance/ADVECTION_steps_vs_iteration_hf_7x7_SPREAD.png
#	examples/fault_tolerance/ADVECTION_steps_vs_iteration_hf_7x7_SPREAD_PREDICT.png
#	examples/fault_tolerance/HEAT_residuals_allstrategies.png
#	examples/fault_tolerance/HEAT_steps_vs_iteration_hf_7x7_INTERP.png
#	examples/fault_tolerance/HEAT_steps_vs_iteration_hf_7x7_INTERP_PREDICT.png
#	examples/fault_tolerance/HEAT_steps_vs_iteration_hf_7x7_NOFAULT.png
#	examples/fault_tolerance/HEAT_steps_vs_iteration_hf_7x7_SPREAD.png
#	examples/fault_tolerance/HEAT_steps_vs_iteration_hf_7x7_SPREAD_PREDICT.png
#	examples/fault_tolerance/postproc_grayscott.py
#	examples/fault_tolerance/postproc_hard_faults_detail.py
#	examples/fault_tolerance/postproc_hard_faults_test.py

Author: pancetta