updates of waterworks 2, client and server
Merge branch 'master' of https://github.com/ramesesinc/projects