Merge branch 'develop' of github.com:matrix-org/synapse into federation_authorization

.gitignore

MANIFEST.in

README.rst

demo/start.sh

setup.py

synapse/app/homeserver.py

synapse/rest/room.py

syweb/__init__.py

syweb/webclient/CAPTCHA_SETUP

syweb/webclient/README

syweb/webclient/app-controller.js

syweb/webclient/app-directive.js

syweb/webclient/app-filter.js

syweb/webclient/app.css

syweb/webclient/app.js

syweb/webclient/bootstrap.css

syweb/webclient/components/fileInput/file-input-directive.js

syweb/webclient/components/fileUpload/file-upload-service.js

syweb/webclient/components/matrix/event-handler-service.js

syweb/webclient/components/matrix/event-stream-service.js