Merge pull request #40 from museoXela/master

Merge Migue4
Merge branch 'master' of https://github.com/Migue4/Desktop
Merge pull request #255 from Migue4/master

Actualizacion
Merge pull request #256 from victorbetha/master

AYJ
Consolidacion

Funcionalidad
Merge pull request #257 from Migue4/master

Consolidacion
Merge pull request #41 from museoXela/master

Merge Migue4
Merge pull request #258 from victorbetha/master

adf
Merge pull request #259 from Migue4/master

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

Merge Migue4
Modulo de eventos async y corrección de errores
Subir ficha a Amazon S3
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
Merge pull request #262 from victorbetha/master

asdgfg
Merge pull request #263 from Migue4/master

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

Merge Migue4
Arreglos varios
Merge branch 'master' of https://github.com/museoXela/Desktop