Aker Brygge Masterplan, Oslo