Avance
Merge branch 'github/desarrollo'

Conflicts:
	application/controllers/P1Controller.php