subo los cambios
subo logo por defecto
Merge branch '0.9.6' into miguel-dev

Conflicts:
	intranet/modules/C4/AR/PdfGenerator.pm