Merge pull request #46 from museoXela/master

Merge pull request #266 from Migue4/master
Revert "Corrección de errores en el modulo de clasificación"

This reverts commit 6c55398f7f56c025f34556f7b3b9b3d70f71f869.
Merge pull request #268 from Migue4/master

Merge pull request #46 from museoXela/master
Merge pull request #47 from museoXela/master

Merge Migue4
Correcciones

Usuarios en eventos y consolidaciones segun logueo
Merge pull request #269 from Migue4/master

Merge Migue4
Merge pull request #77 from museoXela/master

fasdfdfg
asd

adfgdsf
Merge pull request #270 from victorbetha/master

fg
Merge pull request #48 from museoXela/master

Merge Migue4
Clasificaciones

Para eliminar
Merge pull request #271 from Migue4/master

Merge Migue4
afdg

sdf
Merge pull request #272 from victorbetha/master

afdg
Merge pull request #49 from museoXela/master

Merge Migue4
Eliminar - Clasificaciones

Eliminar del modulo
Merge pull request #273 from Migue4/master

Merge Migue4
Eliminar - Eventos

Se eliminan eventos
Merge pull request #274 from Migue4/master

Eliminar - Eventos
Eliminar y Editar - Instalaciones

Elimina/edita una caja o vitrina o sala