Merge pull request #240 from victorbetha/master

zvbcz
Merge pull request #241 from victorbetha/master

ZS
ACTUALIZACION

Cambios en el panel Opciones
Merge branch 'master' of https://github.com/museoXela/Desktop
Merge pull request #242 from victorbetha/master

asdfa
Merge pull request #73 from museoXela/master

,jhgre