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

Conflicts:
	CRMQualium/application/views/modulo_Clientes.php

	modified:   CRMQualium/application/views/modulo_Clientes.php
	modified:   CRMQualium/css/estilos_modulo_clientes.less