Merge branch 'develop' into '1427-oauth-admin-scopes'

CHANGELOG.md

docs/API/differences_in_mastoapi_responses.md

lib/pleroma/user.ex

lib/pleroma/web/activity_pub/activity_pub.ex

lib/pleroma/web/activity_pub/views/user_view.ex

...leroma/web/mastodon_api/controllers/account_controller.ex

lib/pleroma/web/mastodon_api/views/account_view.ex

.../migrations/20191123030554_add_activitypub_actor_type.exs

test/web/mastodon_api/views/account_view_test.exs