Merge remote-tracking branch 'origin/master' into desarrollo
Merge branch 'master' into desarrollo
eliminado bug #46
Merge branch 'desarrollo'