Merge branch 'master' into hcastillo/PutosTodos
Merge remote-tracking branch 'origin/master' into hcastillo/PutosTodos
Merge pull request #7 from museoXela/master

hjkh
Merge remote-tracking branch 'origin/master' into hcastillo/PutosTodos
Merge pull request #2 from museoXela/master

Merge pull request #64 from Migue4/master
Merge pull request #21 from museoXela/master

actualizacion
Merge pull request #65 from t4r0/master

Actualizaciones recientes
Merge pull request #66 from victorbetha/master

Merge pull request #21 from museoXela/master
Merge pull request #22 from museoXela/master

actualizaio
Merge branch 'master' of https://github.com/museoXela/Desktop
Correción de errores

Para que el proyecto pueda ejecutarse
Merge pull request #67 from Migue4/master

Correción de Errores
Merge pull request #68 from victorbetha/master

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

sdfgh
Estandarización

Controles nombrados.
Merge pull request #69 from Migue4/master

Estandarización
Merge pull request #70 from victorbetha/master

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

sadfcv
Merge pull request #4 from museoXela/master

agregado varios metodos a las clases fotografia, eventos
modificacion de clases

clases modificadas con metodos de busquedas  ,
eventos,fotografias,publicacion,traslado