Merge pull request #25 from museoXela/master

m
Merge pull request #17 from museoXela/master

fgghjnm
fasdf

funcionan los 3 mas de instalaciones
Merge pull request #178 from hC4stillo/hcastillo/PutosTodos

Hcastillo/putos todos
Eventos2

Nuevos cambios
Merge pull request #179 from Migue4/master

Eventos2
Merge pull request #18 from museoXela/master

Merge Migue4
Merge pull request #56 from museoXela/master

hjg
Eventos afiches

nuevos cambios
Merge pull request #180 from Migue4/master

Eventos afiches
Merge pull request #19 from museoXela/master

Merge pull request #180 from Migue4/master
Merge pull request #181 from victorbetha/master

Merge pull request #56 from museoXela/master
Merge pull request #57 from museoXela/master

fdghj
ACTUALIZACION
Merge pull request #182 from victorbetha/master

hgjk
Merge pull request #58 from museoXela/master

Merge pull request #182 from victorbetha/master
Merge pull request #183 from Migue4/master

Merge pull request #19 from museoXela/master
Reestructuración formulario investigaciones
Solución a conflictos
Modificación momentanea