Merge pull request #1584 from seanpaultaylor/next

Minor code comment cleanup on new water sample.
Fixed #1581 and added WaterSample to XCode