modified:   application/config/routes.php
	modified:   application/controllers/api.php
	modified:   application/controllers/api_cliente.php
	modified:   application/controllers/escritorio.php
	modified:   application/libraries/my_functions.php
	modified:   application/models/model_contact.php
	modified:   application/models/model_customer.php
	application/controllers/api_telefono.php
	application/models/api_actividades.php
	application/models/model_phone.php
	application/models/model_services.php
	new file:   application/controllers/api_telefono.php
	new file:   application/models/model_phone.php
	new file:   application/models/model_services.php
Merge branch 'master' of https://github.com/geyserG/proyectoEscolar

Conflicts:
	CRMQualium/application/views/modulo_cliente_nuevo.php
	CRMQualium/js/backbone/colecciones/ColeccionClientes.js
	CRMQualium/js/backbone/vistas/VistaNuevoCliente.js

	application/models/api_actividades.php