HAVERFORD, Pa. — The headmaster of a suburban Philadelphia prep school who fought with his son over marijuana will return to his job after an assault charge was dismissed. The Haverford School said Wednesday that the board of trustees’ decision on the status of John Nagl followed an assessment of what was called “a deeply