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

docs/client-server/specification.rst

docs/client-server/swagger_matrix/api-docs

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

docs/client-server/swagger_matrix/api-docs-events

docs/client-server/swagger_matrix/api-docs-login

docs/client-server/swagger_matrix/api-docs-presence

docs/client-server/swagger_matrix/api-docs-profile

docs/client-server/swagger_matrix/api-docs-registration

docs/client-server/swagger_matrix/api-docs-rooms

docs/client-server/web/README

docs/client-server/web/files/backbone-min.js

docs/client-server/web/files/css

docs/client-server/web/files/handlebars-1.0.0.js

docs/client-server/web/files/highlight.7.3.pack.js

docs/client-server/web/files/jquery-1.8.0.min.js

docs/client-server/web/files/jquery.ba-bbq.min.js

docs/client-server/web/files/jquery.slideto.min.js

docs/client-server/web/files/jquery.wiggle.min.js

docs/client-server/web/files/reset.css

docs/client-server/web/files/screen.css