City returns animal trainer's dogs, trainer agrees to drop lawsuits