gestion de pago y gestion de descripción creditos
Merge remote-tracking branch 'origin/master'

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

Conflicts:
	protected/runtime/application.log