variosFormato
Merge branch 'master' of https://github.com/miguelplazasr/IDPC_Contratacion

Conflicts:
	src/IDPC/ContractualBundle/Resources/views/Contrato/index.html.twig
	src/IDPC/ContractualBundle/Resources/views/Pago/index.html.twig