Merge remote-tracking branch 'origin/master'
Se edito la vista de Opciones
Merge remote-tracking branch 'origin/master'