Merge branch 'develop' into 'muting-fixes'

src/App.scss

src/boot/after_store.js

src/boot/routes.js

src/components/conversation-page/conversation-page.js

src/components/conversation-page/conversation-page.vue

src/components/conversation/conversation.js

src/components/conversation/conversation.vue

src/components/login_form/login_form.vue

src/components/password_reset/password_reset.js

src/components/password_reset/password_reset.vue

src/components/status/status.js

src/components/still-image/still-image.vue

src/components/timeline/timeline.js

src/components/timeline/timeline.vue

src/components/user_card/user_card.js

src/components/user_card/user_card.vue

src/components/user_profile/user_profile.vue

src/components/who_to_follow/who_to_follow.js

src/components/who_to_follow_panel/who_to_follow_panel.js

src/i18n/en.json