Adjusted functionallity for getWaterHeight
Merge branch 'master' of https://github.com/tsunamiSim/SWE

Conflicts:
	src/tools/help.hh
Added calculation of bathymetry