waterfront master plan