Merge pull request #42 from museoXela/master

Merge Migue4
Subir ficha a Amazon S3
laksd

asdfdsfd
Merge pull request #260 from victorbetha/master

laksd
Merge pull request #261 from Migue4/master

Merge pull request #42 from museoXela/master
Merge pull request #43 from museoXela/master

Merge Migue4
asdgfg

dfgd
Merge pull request #262 from victorbetha/master

asdgfg
Merge pull request #263 from Migue4/master

Merge pull request #43 from museoXela/master
Arreglos varios
Merge branch 'master' of https://github.com/museoXela/Desktop