HCM City approves water supply master plan