Arreglos varios
Merge branch 'master' of https://github.com/museoXela/Desktop
Merge pull request #264 from Migue4/master

Cambios
Merge pull request #45 from museoXela/master

Merge Migue4