initial commit

merging hydro-devel and master