Merge pull request #53 from museoXela/master

ghjk
Guardar sala
Merge branch 'master' of https://github.com/museoXela/Desktop
Guardado de salas
Merge pull request #170 from JEscalanteGT/master

Cambio en formulario de sala y guardado
Merge pull request #171 from victorbetha/master

Merge pull request #53 from museoXela/master
Merge pull request #172 from Migue4/master

efsdf
Merge pull request #16 from museoXela/master

CDkj