merge develop and fix conflicts AGAIN

src/components/media_upload/media_upload.js

src/components/media_upload/media_upload.vue

src/components/notification/notification.js

src/components/notification/notification.vue

src/components/notifications/notifications.scss

src/components/post_status_form/post_status_form.js

src/components/post_status_form/post_status_form.vue

src/components/status/status.js

src/components/status/status.vue

src/components/still-image/still-image.js

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

src/components/user_avatar/user_avatar.js

src/components/user_avatar/user_avatar.vue

src/components/user_card/user_card.js

src/components/user_card/user_card.vue

src/components/user_card_content/user_card_content.js

src/components/user_card_content/user_card_content.vue

src/components/user_settings/user_settings.js

src/components/user_settings/user_settings.vue

src/i18n/de.json