Merge branch 'develop' into storage_transactions

.gitignore

docs/client-server/swagger_matrix/rooms

synapse/api/notifier.py

synapse/api/streams/event.py

synapse/handlers/_base.py

synapse/handlers/events.py

synapse/handlers/federation.py

synapse/handlers/presence.py

synapse/handlers/room.py

synapse/notifier.py

synapse/rest/events.py

synapse/rest/initial_sync.py

synapse/rest/room.py

synapse/server.py

synapse/storage/stream.py

synapse/streams/__init__.py

synapse/streams/config.py

synapse/streams/events.py

synapse/types.py

webclient/app.css