Colecciones

backb
ttt

ttt
Merge branch 'master' of https://github.com/maykultman/MiPrimerProyecto

Conflicts:
	CRMQualium/application/views/pruebapdf.php
	CRMQualium/js/backbone/colecciones/ColeccionContratos.js
	CRMQualium/js/backbone/colecciones/ColeccionPagos.js
	CRMQualium/js/backbone/colecciones/ColeccionServiciosContrato.js

	modified:   application/models/model_contract.php
	new file:   application/views/formato_cotizacion.html
	modified:   application/views/modulo_contratos_historial.php
	modified:   application/views/modulo_contratos_nuevo.php
	modified:   application/views/modulo_usuarios_consulta.php
	modified:   application/views/pruebapdf.php
	modified:   css/estilos_modulo_usuarios.css
	modified:   js/backbone/colecciones/ColeccionContratos.js
	modified:   js/backbone/colecciones/ColeccionPagos.js
	modified:   js/backbone/colecciones/ColeccionServiciosContrato.js
	new file:   js/backbone/colecciones/formatoContrato.php
	new file:   js/backbone/vistas/VistaConsultaContrato.js
	deleted:    js/backbone/vistas/VistaContrato.js
	modified:   js/backbone/vistas/VistaNuevoContrato.js