cambios en main
conflicts resolved
Merge branch 'dev' of github.com:NEWLIFEVE/Etelix_RENOC into dev