Terminada parte localizacion
Merge branch 'master' of https://github.com/Guillermo30/mydroidpet