Merge pull request #3 from museoXela/master

actualizacion
asdfa

sdfgsd
Merge pull request #242 from victorbetha/master

asdfa
Merge pull request #73 from museoXela/master

,jhgre
Merge pull request #243 from kaliman2014/master

Merge pull request #3 from museoXela/master
Complementos de investigación
Merge branch 'master' of https://github.com/museoXela/Desktop
Consolidaciones y Categorias

Para mejor funcionamiento
Merge pull request #245 from Migue4/master

Consolidaciones y Categorias
Merge pull request #37 from museoXela/master

Merge Migue4
Cambio de clase error

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

gfhj
asdf

asdf
Merge pull request #247 from victorbetha/master

asdf
as;dlfk

asdf
Cambios en el modulo de usuarios
Merge pull request #248 from victorbetha/master

as;dlfk
Merge branch 'master' of https://github.com/museoXela/Desktop
Consolidaciones

Para crear