Merge remote-tracking branch 'David/master'
Creando Vistas de informes
Merge remote-tracking branch 'Rafael/master'

Conflicts:
	bd/pt/creditos/pk_creditos_bod.sql
	bd/pt/creditos/pk_creditos_bod.sql.orig