fixed lake 2
Merge branch 'staging' of https://github.com/TAMED/seasons into staging