Torrance flight school, city settle business license dispute