aplicacion.log
aplciacion
Merge remote-tracking branch 'Diego/master'

Conflicts:
	protected/controllers/CREDITOController.php
	protected/runtime/application.log
Merge remote-tracking branch 'Rafael/master'

Conflicts:
	protected/controllers/CREDITOController.php
	protected/runtime/application.log
Merge remote-tracking branch 'Nicolas/master'

Conflicts:
	protected/controllers/CREDITOController.php
	protected/runtime/application.log
Merge remote-tracking branch 'Nicolas/master'

Conflicts:
	protected/controllers/CREDITOController.php
	protected/runtime/application.log
	protected/runtime/application.log.orig
cambios en sql
merge
Merge remote-tracking branch 'Rafael/master'

Conflicts:
	protected/controllers/CREDITOController.php
	protected/runtime/application.log
Merge remote-tracking branch 'David/master'

Conflicts:
	protected/runtime/application.log
arreglo de empaquetamiento
Trabajando en sucias
Merge remote-tracking branch 'Rafael/master'

Conflicts:
	bd/all/init/init_all_sql_plus.sql
	protected/controllers/CREDITOController.php
	protected/runtime/application.log
.
Contiuando con sucias
Merge remote-tracking branch 'David/master'

Conflicts:
	bd/all/init/init_all_sql_plus.sql
	protected/runtime/application.log
Merge remote-tracking branch 'Diego/master'

Conflicts:
	bd/all/init/init_all_sql_plus.sql
	bd/pt/creditos/pk_creditos_bod.sql
	protected/runtime/application.log
Generando Vista de informe credito
Triggers aportes y socios
Merge Diego