Merge pull request #10 from museoXela/master

Modificar
Merge pull request #48 from museoXela/master

ada
asd

no se
Merge pull request #150 from hC4stillo/master

asd
Merge pull request #151 from hC4stillo/hcastillo/PutosTodos

Hcastillo/putos todos
Merge branch 'master' of https://github.com/museoXela/Desktop
ACTUALIZACION

Cambios importantes, se ha agregado el editor de fichas
Merge branch 'master' of https://github.com/museoXela/Desktop
Merge pull request #152 from Migue4/master

Merge pull request #10 from museoXela/master
Merge pull request #153 from victorbetha/master

Merge pull request #48 from museoXela/master
Merge pull request #49 from museoXela/master

asdfgthj
actualizacion de grupo
Merge pull request #154 from victorbetha/master

actualizacion grupos
Merge pull request #11 from museoXela/master

ssadsads
Usuarios

adsasa
Merge branch 'master' of https://github.com/Migue4/Desktop

Conflicts:
	MuseoCliente/modUsuarios/modUsuario.xaml
Merge pull request #155 from Migue4/master

dsfdsf
Merge pull request #50 from museoXela/master

gfhjhgf
ACTUALIZACION GRUPO

ASDGD
Mejoras

Para que compile el proyecto