Urban water systems, demand management and sustainable development