Cotizaciones

vinculos arreglados
Merge branch 'master' of https://github.com/geyserG/proyectoQ

Conflicts:
	CRMQualium/application/controllers/escritorio.php

	modified:   CRMQualium/application/views/modulo_cotizaciones.php