conexion bd local
Merge branch 'dev' of github.com:NEWLIFEVE/Etelix_SORI into dev
conexion bd prod
cambios
Merge branch 'master' of github.com:NEWLIFEVE/Etelix_SORI
Merge branch 'dev'
resolviendo conflictops
resolviendo conflictops
Release 1.5.7.4
Release 1.5.7.4
Merge branch 'dev' of github.com:NEWLIFEVE/Etelix_SORI into dev

Conflicts:
	README.md
	src/web/protected/config/main.php
merging
resolviendo conflictos
Merge branch 'dev' of github.com:NEWLIFEVE/Etelix_SORI into dev
readme
fix readme
v1.5.7.5