+correo
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/classes/controller/api/face.php