Merge pull request #25 from museoXela/master

m
ACTUALIZACION

Editor de fichas listo
Merge branch 'master' of https://github.com/museoXela/Desktop
fasdf

funcionan los 3 mas de instalaciones
Merge pull request #178 from hC4stillo/hcastillo/PutosTodos

Hcastillo/putos todos
Merge pull request #179 from Migue4/master

Eventos2
Merge pull request #18 from museoXela/master

Merge Migue4