Merge pull request #38 from museoXela/master

Cambios
Merge pull request #74 from museoXela/master

rhtjhkjk
asd

sdfgsdf
Merge branch 'master' of https://github.com/victorbetha/Desktop
Merge pull request #250 from victorbetha/master

ukytkulk
asdgs

dfghdfg
Merge pull request #251 from victorbetha/master

asdgs
Consolidacion dos

Para guardar
Merge pull request #252 from Migue4/master

Merge Migue4
Merge pull request #39 from museoXela/master

Merge Migue4
ACTUALIZACION

Registro de fichas
Merge branch 'master' of https://github.com/museoXela/Desktop
Consolidaciones

Mejoras
Merge pull request #253 from Migue4/master

Merge Migue4
Merge pull request #40 from museoXela/master

Merge Migue4
ACTUALIZACION

Cambio en algunos estilos
Merge pull request #75 from museoXela/master

bkjvhg
ACTUALIZACION

Cambios en los estilos
Merge pull request #254 from victorbetha/master

Merge pull request #75 from museoXela/master
FIXED

conflictos en el diseño de un formulario