Water_controller finish
Merge branch 'master' of https://github.com/k-team/g-home