Merge pull request #51 from museoXela/master

ERJKJH
Merge pull request #12 from museoXela/master

efse
Usuarios

Mejoras
Merge pull request #158 from Migue4/master

Merge Migue4
ACTUALIZACION GURPO

funcion de asiganar usuairos a los grupos
Merge pull request #159 from victorbetha/master

asfgsg
Merge pull request #52 from museoXela/master

hdgfds
actualizacion

gdsgf
Merge pull request #160 from victorbetha/master

acyszfgfbb
Categorias

cambios para que funcionen mejor
Merge pull request #161 from Migue4/master

Categorias
Merge pull request #162 from hC4stillo/master

Merge pull request #23 from museoXela/master
Merge pull request #24 from museoXela/master

khk