UC Davis and California Strawberry Commission settle lawsuit, set new direction