Using data adapters instead of direct calls
Refactoring Lake filter
Merge branch 'master' of https://github.com/nocturnedesign/WaterWays.git