Hi?
Merge remote-tracking branch 'upstream/master'
Water functionality, formatting of the Water Activity xml and Locate
Merge pull request #26 from palegin/water-functionality

Water functionality