Merge branch 'Ajustes-jracosta'

Conflicts:
uno.php