credito2
Merge https://github.com/dimortizp/facis
Fin restricciones en los modelos
Merge https://github.com/dimortizp/facis

Conflicts:
	protected/runtime/application.log