Merge branch 'master' of github.com:infoalex/SASv2
Merge branch 'master' of github.com:ArrozAlba/SASv2
Merge branch 'master' of github.com:ArrozAlba/SASv2
Ajustes entidad titular
Merge pull request #11 from infoalex/master

De los maestros solo falta recaudo
Ajustes a Titular
Merge branch 'master' of github.com:infoalex/SASv2

Conflicts:
	default/app/views/beneficiarios/titular/agregar.phtml
Agregada DATA para maestros auxiliares
Merge pull request #12 from jelitox/master

ajustes entidad titular
Merge pull request #13 from infoalex/master

No se uqe hay nuevo pero no habia hecho commit
Merge branch 'master' of github.com:infoalex/SASv2

Conflicts:
	default/app/models/beneficiarios/titular.php
Programadas Solicitudes
Delete bd_sas_finale.sql
Delete dbkm.sql
Delete mer.png
Delete mer_empresa.png
Delete mysql_backend.sql
Delete postgre_backend.sql
Delete postgre_sas_backend.sql
Programadas Solicitudes