Merge branch 'hotfix'
updated languages
Merge branch 'hotfix' into develop