color .resaltado
Merge branch 'master' of github.com:NEWLIFEVE/Etelix_SINCA
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
fixed conflicts
bd sori