Joining-up Urban Water Management with Urban Planning and Design