preparando merge
Merge branch 'dev' of github.com:NEWLIFEVE/Etelix_SORI
modificaciones para ambiente de desarrollo laptop
Merge branch 'dev' of github.com:NEWLIFEVE/Etelix_SORI into dev
Merge branch 'dev' of github.com:NEWLIFEVE/Etelix_SORI into dev
Merge branch 'dev' of github.com:NEWLIFEVE/Etelix_SORI into dev
ordenando cosas
	Merge branch 'dev' of github.com:NEWLIFEVE/Etelix_SORI into dev
cambios
commit por merge
Merge branch 'dev' of github.com:NEWLIFEVE/Etelix_SORI into dev
Merge branch 'dev' of github.com:NEWLIFEVE/Etelix_SORI into dev
Merge branch 'dev' of github.com:NEWLIFEVE/Etelix_SORI into dev
Merge branch 'dev' of github.com:NEWLIFEVE/Etelix_SORI into dev
apurado
acomodado borrado de archivos en uploads
preparando merge a master
Merge branch 'dev'
Merge branch 'master' of github.com:NEWLIFEVE/Etelix_SORI