Merge branch 'develop' into 'editProfile'

CHANGELOG.md

src/App.js

src/App.vue

src/components/settings_modal/tabs/general_tab.js

src/components/settings_modal/tabs/general_tab.vue

src/i18n/en.json

src/modules/config.js