otro commit para adaptarlo a codeigniter
	modified:   CRMQualium/application/config/routes.php
	modified:   CRMQualium/application/controllers/api.php
	modified:   CRMQualium/application/controllers/api_cliente.php
	modified:   CRMQualium/application/controllers/escritorio.php
	modified:   CRMQualium/application/models/model_customer.php
Merge branch 'master' of https://github.com/geyserG/proyectoEscolar

Conflicts:
	CRMQualium/application/controllers/api.php
	CRMQualium/application/controllers/api_cliente.php
	CRMQualium/application/controllers/escritorio.php
	CRMQualium/application/models/model_contact.php
	CRMQualium/application/models/model_customer.php

	modified:   CRMQualium/application/config/database.php
	modified:   CRMQualium/application/config/routes.php
	modified:   CRMQualium/application/controllers/api.php
	modified:   CRMQualium/application/controllers/api_cliente.php
	new file:   CRMQualium/application/controllers/api_telefono.php
	modified:   CRMQualium/application/controllers/escritorio.php
	modified:   CRMQualium/application/libraries/my_functions.php
	new file:   CRMQualium/application/models/model_contact.php
	modified:   CRMQualium/application/models/model_customer.php
	new file:   CRMQualium/application/models/model_phone.php
	new file:   CRMQualium/application/models/model_services.php
	modified:   CRMQualium/application/views/modulo_cliente_nuevo.php
	modified:   CRMQualium/application/views/modulo_consulta_clientes.php
	new file:   CRMQualium/css/bootstrap-3.1.1-dist/js/alert.js
	new file:   CRMQualium/img/fotosClientes/LOGO_TEC_OFICIAL.jpg
	new file:   CRMQualium/img/fotosClientes/bordes-de-escudo.jpg
	modified:   CRMQualium/js/backbone/colecciones/ColeccionClientes.js
	modified:   CRMQualium/js/backbone/vistas/VistaNuevoCliente.js