CRMQualium/application/config/rest.php
	CRMQualium/application/controllers/API.php
	CRMQualium/application/libraries/Format.php
	CRMQualium/application/libraries/REST_controller.php
	CRMQualium/application/models/clientes.php
Merge branch 'master' of https://github.com/geyserG/proyectoQ

Conflicts:
	CRMQualium/application/controllers/escritorio.php

	modified:   CRMQualium/application/controllers/escritorio.php