Merge branch 'master' of github.com:matrix-org/synapse

MAP.rst

README.rst

docs/server-server/specification.rst

synapse/api/constants.py

synapse/app/homeserver.py

synapse/federation/transport.py

tests/federation/test_federation.py

tests/handlers/test_presence.py

tests/handlers/test_presencelike.py

tests/rest/test_presence.py

webclient/app.css

webclient/room/room-controller.js

webclient/room/room.html