Merge branch 'ostatus' into develop

config/config.exs

config/test.exs

lib/pleroma/web/endpoint.ex

lib/pleroma/web/ostatus/activity_representer.ex

lib/pleroma/web/ostatus/feed_representer.ex

lib/pleroma/web/ostatus/ostatus.ex

lib/pleroma/web/ostatus/ostatus_controller.ex

lib/pleroma/web/ostatus/user_representer.ex

lib/pleroma/web/router.ex

lib/pleroma/web/twitter_api/twitter_api.ex

lib/pleroma/web/web_finger/web_finger.ex

lib/pleroma/web/websub/websub.ex

lib/pleroma/web/websub/websub_controller.ex

lib/pleroma/web/websub/websub_server_subscription.ex

mix.exs

mix.lock

...ons/20170418200143_create_webssub_server_subscription.exs

test/support/factory.ex

test/web/ostatus/activity_representer_test.exs

test/web/ostatus/feed_representer_test.exs