cambios
Merge branch 'dev' of github.com:NEWLIFEVE/Etelix_ETTS into dev
merge con dev remoto
resolviendo conflictos