Merge pull request #310 from calonso-conabio/master

set locales