Lake page loading model
Small conflict
Merge branch 'master' of https://github.com/ebuyukcan/WiserWater