Merge pull request #5 from museoXela/master

Merge pull request #18 from victorbetha/master
Merge pull request #21 from victorbetha/master

Merge pull request #5 from museoXela/master
ACTUALIZACION

acutalizacion
Merge pull request #22 from victorbetha/master

ACTUALIZACION
Traslado

funciones de edicion y listado añadidas
Merge pull request #23 from hC4stillo/hcastillo/Traslado

Traslado
Merge pull request #6 from museoXela/master

hugo
Merge pull request #1 from museoXela/master

jkl
Merge pull request #1 from museoXela/master

usuarios
usuarios
Merge pull request #24 from bryanangom/master

Usuarios
Merge pull request #25 from victorbetha/master

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

usuario 2
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