Merge dev fix conflicts

src/boot/routes.js

src/components/attachment/attachment.js

src/components/attachment/attachment.vue

src/components/side_drawer/side_drawer.js

src/components/side_drawer/side_drawer.vue

src/components/status/status.js

src/components/status/status.vue

src/components/who_to_follow/who_to_follow.js

src/components/who_to_follow/who_to_follow.vue

src/components/who_to_follow_panel/who_to_follow_panel.js

src/components/who_to_follow_panel/who_to_follow_panel.vue

src/i18n/en.json

src/i18n/ja.json

src/i18n/ko.json

src/i18n/messages.js

static/logo.png

yarn.lock