Avance
Merge branch 'origin/desarrollo'

Conflicts:
	application/controllers/IndexController.php