Merge branch 'develop' into 'oembed_provider'

# Conflicts:
#   lib/pleroma/activity.ex

diff --cc lib/pleroma/formatter.ex
Simple merge

diff --cc lib/pleroma/user.ex
Simple merge

diff --cc lib/pleroma/web/ostatus/ostatus_controller.ex
Simple merge

diff --cc lib/pleroma/web/router.ex
Simple merge