City council approved a long-anticipated waterfront development in Naples that will include lodging with boat docks.