Merge branch 'dev'
added translations
Merge branch 'master' into dev