ajustes merge
Ajustes
Merge branch 'master' into dev