para manana a CFE dia 03-12
corrigiendo conflictos
Merge branch 'master' of https://github.com/zykorwx/androidtelinfo