Merge remote-tracking branch 'upstream/develop' into media-proxy

lib/pleroma/application.ex

lib/pleroma/plugs/authentication_plug.ex

lib/pleroma/user.ex

lib/pleroma/web/channels/user_socket.ex

lib/pleroma/web/chat_channel.ex

lib/pleroma/web/mastodon_api/mastodon_api_controller.ex

lib/pleroma/web/ostatus/user_representer.ex

lib/pleroma/web/twitter_api/twitter_api_controller.ex

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

...epo/migrations/20171130135819_add_local_index_to_user.exs

priv/static/index.html

...tatic/static/css/app.1c9a07d790a4262baf47d33a2a3e71c5.css

...c/static/css/app.1c9a07d790a4262baf47d33a2a3e71c5.css.map

...tatic/static/css/app.67f64792f89a96e59442c437c7ded0b3.css

...c/static/css/app.67f64792f89a96e59442c437c7ded0b3.css.map

priv/static/static/js/app.a4d345815ef9d13e9524.js

priv/static/static/js/app.a4d345815ef9d13e9524.js.map

priv/static/static/js/app.fefccf252cac9e1310ea.js

priv/static/static/js/app.fefccf252cac9e1310ea.js.map

priv/static/static/js/manifest.ee87253244897e08bdce.js