update branch and fix merge conflicts

README.md

index.html

package.json

src/App.js

src/App.scss

src/App.vue

src/components/attachment/attachment.js

src/components/attachment/attachment.vue

src/components/conversation/conversation.js

src/components/conversation/conversation.vue

src/components/notifications/notifications.js

src/components/notifications/notifications.scss

src/components/notifications/notifications.vue

src/components/post_status_form/post_status_form.js

src/components/post_status_form/post_status_form.vue

src/components/settings/settings.js

src/components/settings/settings.vue

src/components/status/status.js

src/components/status/status.vue

src/components/timeline/timeline.js