commit para el modulo de consulta de clientes
otro commit
Merge branch 'master' of https://github.com/geyserG/proyectoEscolar

Conflicts:
	CRMQualium/application/views/modulo_consulta_prospectos.php

	modified:   CRMQualium/application/views/modulo_consulta_clientes.php
	modified:   CRMQualium/application/views/modulo_consulta_prospectos.php