Add thirst replenishment from rivers, closes #61
Merge branch 'feature/riverThirst' into develop