Merge branch 'hydro_dev' of github.com:ipa320/cob_extern into hydro_dev

Conflicts:
	CMakeLists.txt
	libmesasr/Makefile