water station mapping
Merge pull request #1 from rburda/master

pull me!