Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth

diff --cc config/config.exs
Simple merge

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

diff --cc lib/pleroma/web/auth/pleroma_authenticator.ex
Simple merge

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

diff --cc lib/pleroma/web/oauth/oauth_controller.ex
Simple merge

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