Entrega a juntas municipales
Sistema prefinal
Merge branch 'siapac-0.2' of https://github.com/hawkzc/siapac into siapac-0.2

Conflicts:
	.directory
	application/controllers/cobro_parcial.php
	application/controllers/nuevo_contrato.php
	application/models/item.php
	application/views/agregar_descuento.php
	application/views/plantilla_contrato.php
	application/views/recibo_cobro_automatico.php
	css/contrato.css
	css/contrato.png
	css/rfc.png
	css/rstyle.css
	system/language/es/form_validation_lang.php