Merge branch 'hotfix/translations'
bugfix: locales are now stored in json files, not directories
Merge branch 'hotfix/fix-locale-detection' into develop