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

# Conflicts:
#	lib/pleroma/web/oauth/oauth_controller.ex
#	lib/pleroma/web/router.ex

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

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

diff --cc lib/pleroma/web/router.ex
index b09d1e31c0260226c63f3b10708441d6435e20f4,605a327fc382960dee697305a1648244b4a1f66d..5101e1b18631d74ea8d6427c8c049430a29209c3
--- 1/lib/pleroma/web/router.ex
--- 2/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@@ -5,11 -5,11 +5,16 @@@
  defmodule Pleroma.Web.Router do
    use Pleroma.Web, :router
  
 +  pipeline :browser do
 +    plug(:accepts, ["html"])
 +    plug(:fetch_session)
 +  end
 +
+   pipeline :oauth do
+     plug(:fetch_session)
+     plug(Pleroma.Plugs.OAuthPlug)
+   end
+ 
    pipeline :api do
      plug(:accepts, ["json"])
      plug(:fetch_session)