several changes
Merge branch 'cg_exp' of https://github.com/psamfass/SWE into cg_exp

Conflicts:
	src/blocks/SWE_NH_Block.cpp
	src/examples/swe_simple_NH.cpp