Merge branch 'from/develop/tusooa/tree-threading' into 'develop'

src/_variables.scss

src/components/conversation/conversation.js

src/components/conversation/conversation.vue

src/components/settings_modal/helpers/integer_setting.js

src/components/settings_modal/helpers/integer_setting.vue

src/components/settings_modal/tabs/filtering_tab.js

src/components/settings_modal/tabs/filtering_tab.vue

src/components/settings_modal/tabs/general_tab.js

src/components/settings_modal/tabs/general_tab.vue

src/components/status/status.js

src/components/status/status.scss

src/components/status/status.vue

src/components/status_body/status_body.js

src/components/status_body/status_body.vue

src/components/status_content/status_content.js

src/components/status_content/status_content.vue

src/components/thread_tree/thread_tree.js

src/components/thread_tree/thread_tree.vue

src/i18n/en.json

src/modules/config.js