Merge branch 'dev'
Merge branch 'dev'
Ability to set language in settings
Addition to previous commit
Merge branch 'dev'