Merge branch 'Gaby'
fix locale to es - hard coded
Merge branch 'master' into Gaby