Merge branch develop into server2server_signing

README.rst

WISHLIST.rst

docs/client-server/howto.rst

docs/client-server/model/presence.rst

docs/client-server/swagger_matrix/api-docs-directory

docs/definitions.rst

docs/specification-NOTHAVE.rst

docs/specification.rst

docs/state_resolution.rst

jsfiddles/example_app/demo.js

jsfiddles/register_login/demo.js

synapse/app/homeserver.py

synapse/config/_base.py

synapse/federation/replication.py

synapse/federation/transport.py

synapse/handlers/directory.py

synapse/handlers/login.py

synapse/handlers/register.py

synapse/http/client.py

synctl