Merge branch 'master' into develop

Conflicts:
	examples/advection/LaxFridrichs.h
	examples/advection/advection.h
	examples/advection/advectionProblem_impl.h
	examples/inviscid-flow/1d/EulerPressureGetter.h
	examples/inviscid-flow/1d/EulerVelGetter.h
	examples/inviscid-flow/1d/LaxFridrichsContinuity.h
	examples/inviscid-flow/1d/LaxFridrichsEnergy.h
	examples/inviscid-flow/1d/LaxFridrichsMomentum.h
	examples/inviscid-flow/1d/eulerProblem_impl.h
	examples/inviscid-flow/2d/EulerPressureGetter.h
	examples/inviscid-flow/2d/EulerVelGetter.h
	examples/inviscid-flow/2d/EulerVelXGetter.h
	examples/inviscid-flow/2d/EulerVelYGetter.h
	examples/inviscid-flow/2d/LaxFridrichsContinuity.h
	examples/inviscid-flow/2d/LaxFridrichsEnergy.h
	examples/inviscid-flow/2d/LaxFridrichsMomentumX.h
	examples/inviscid-flow/2d/LaxFridrichsMomentumY.h
	examples/inviscid-flow/2d/euler.h
	examples/inviscid-flow/eulerProblem_impl.h