Singapore unveils master plan for port, airport, waterfront