Merge pull request #1 from museoXela/master

jkl
Merge pull request #7 from museoXela/master

Actualizacion
Vitrina

añadidas funciones de añadir y listado para vitrinas
Merge pull request #26 from hC4stillo/hcastillo/vitrinas

Hcastillo/vitrinas
Merge pull request #27 from victorbetha/master

Merge pull request #7 from museoXela/master
Merge pull request #8 from museoXela/master

Hugo
ACTUALIZACION DE PEDRO

Renovar las clases de pedro YAC
Merge pull request #28 from victorbetha/master

Actualizacion de Pedro YAc
Merge pull request #2 from museoXela/master

asljdfa
ACTUALIZACION

actualizacion de categoria coleccion error eventos investigacion piezas
y de errores se agrego el error de modificar que sera id 4
Merge pull request #29 from victorbetha/master

ACTUALIZACION
Trabajo

funciones para:
-caja
-sala
-traslado
-vitrina
Merge pull request #9 from museoXela/master

asdf
Merge pull request #31 from hC4stillo/hcastillo/PutosTodos

Hcastillo/putos todos
Merge pull request #33 from victorbetha/master

Merge pull request #9 from museoXela/master
Merge pull request #32 from bryanangom/master

Merge pull request #2 from museoXela/master
Merge pull request #10 from museoXela/master

actualizacion de todo
Merge pull request #34 from bryanangom/master

Clases compuestas
Merge pull request #35 from victorbetha/master

Merge pull request #10 from museoXela/master
Merge pull request #3 from museoXela/master

actualizar