commit que quiere rodrigo
Merge branch 'master' of https://github.com/geyserG/proyectoQ

Conflicts:
	CRMQualium/application/views/modulo_cliente_nuevo.php
Merge branch 'master' of https://github.com/geyserG/proyectoQ