Merge develop to 788-separate-email-addresses

Merge conflicts:
test/web/twitter_api/twitter_api_test.exs
test/web/twitter_api/twitter_api_controller_test.exs
test/web/admin_api/admin_api_controller_test.exs

diff --cc config/config.exs
Simple merge

diff --cc config/test.exs
index 2c4beaade9bc36ad75958857df14c14351bea585,13a031d199acaebb7febe6233294de014360aef5..f93bc5994dae1ef008de47c953ae96006b22b027
--- 1/config/test.exs
--- 2/config/test.exs
+++ b/config/test.exs
@@@ -21,12 -21,8 +21,12 @@@ config :pleroma, Pleroma.Upload, filter
  
  config :pleroma, Pleroma.Uploaders.Local, uploads: "test/uploads"
  
- config :pleroma, Pleroma.Mailer, adapter: Swoosh.Adapters.Test
+ config :pleroma, Pleroma.Emails.Mailer, adapter: Swoosh.Adapters.Test
  
 +config :pleroma, :instance,
 +  email: "admin@example.com",
 +  notify_email: "noreply@example.com"
 +
  # Configure your database
  config :pleroma, Pleroma.Repo,
    adapter: Ecto.Adapters.Postgres,

diff --cc docs/config.md
Simple merge

diff --cc lib/pleroma/emails/admin_email.ex
Simple merge

diff --cc lib/pleroma/emails/user_email.ex
Simple merge

diff --cc test/web/mastodon_api/mastodon_api_controller_test.exs
Simple merge