Avance
Merge branch 'github/desarrollo'

Conflicts:
	application/views/p0-0.php
	application/views/p1-2.php