Merge pull request #70 from museoXela/master

b,mvnb
Merge pull request #29 from museoXela/master

aSDsad
Merge pull request #236 from hC4stillo/master

Merge pull request #29 from museoXela/master
ACTUALIZACION

asdlfkjasd
Merge pull request #237 from victorbetha/master

aacsdfh
ACTUALIZACION

Cambio en el control OptionPanel
Merge branch 'master' of https://github.com/museoXela/Desktop