commit por merge
Merge branch 'sinca2' of github.com:NEWLIFEVE/Etelix_SINCA into sinca2
Merge branch 'sinca2' of github.com:NEWLIFEVE/Etelix_SINCA into sinca2
conflicts resolved