actualizando lanas
Merge branch 'develop'
actualizando manual.
Merge branch 'master' into develop