Fixed a problem in locale
Rebuild locale
Merge branch 'master' into development
cleaned up tests