Added support for locale es
Merge branch 'feature-language' into develop

* feature-language:
  Added support for locale es