hydrogen-devel change master site to github
build fixed ready for adding to svn.
include conflict addition to hydrogen