image plus
comit escrtitorio
Merge branch 'master' of https://github.com/geyserG/proyectoQ

Conflicts:
	CRMQualium/application/controllers/escritorio.php
	CRMQualium/application/views/modulo_Clientes.php