cambios
resolviendo conflictos
Merge branch 'dev' of github.com:NEWLIFEVE/Etelix_SINCA into dev