Merge conflicts between local changes and Juan chages. I changed the validation of the kml