fix conflicts and add error handling to media descriptions

CHANGELOG.md

src/components/post_status_form/post_status_form.js

src/components/post_status_form/post_status_form.vue

src/components/status/status.vue

src/components/status_content/status_content.vue

src/components/user_panel/user_panel.vue

src/i18n/en.json

src/services/api/api.service.js

src/services/status_poster/status_poster.service.js