Lector de propiedades mejorado
Solucion conflicto
Merge branches 'RamaCrawler' and 'RamaCrawler' of https://github.com/Arquisoft/ObservaTerra12 into RamaCrawler
Merge branch 'RamaCrawler'