Added water tiles
Merge branch 'master' of https://github.com/ZimonD/ContextCG7
Added houses to client.