Merge branch 'master' into design
Arreglos en halo de personas.
Merge branch 'design'