fixed bug with locale
Merge branch 'master' of github.com:gena-admin/test-system