Merge pull request #61 from museoXela/master

bnm,
Merge pull request #22 from museoXela/master

Merge Migue4
Instalaciones

Cambios
Merge pull request #190 from Migue4/master

Instalaciones
actualizacion de piezas
Merge pull request #23 from museoXela/master

Merge Migue4
Merge pull request #191 from victorbetha/master

jh
Instalaciones

Cambios
Merge pull request #192 from Migue4/master

Merge Migue4
Merge pull request #24 from museoXela/master

fgdfgd
Instalaciones

crear salas, vitrinas y cajas, modificar cajas.
Merge pull request #193 from Migue4/master

Instalaciones
Merge branch 'master' of https://github.com/museoXela/Desktop
ACTUALIZACION

Cambios en option panel