Make sure to return an empty JSON object ({}) from presence PUT/POST requests rather than an empty string ("") because most deserialisers won't like the latter
Add support for org.matrix.custom.text.html

This format will remain undocumented as it is not yet suitable for
introduction into the specification.
Remove org.matrix.custom.text.html event type and replace it with 'format' and 'formatted_body' keys on m.text messages
Add unsanitizedLinky filter to fix links in formatted messages.

This filter is identical to ngSanitize's linky but instead of
sanitizing text which isn't linkified in the addText function,
it doesn't.
Remove warning since the end result is still $sanitize'd
move gendoc into matrix-doc project
SPEC-7: Don't stamp event contents with 'hsob_ts'
SPEC-7: Rename 'ts' to 'origin_server_ts'
keep 'origin_server_ts' as 'ts' in the database to avoid needlessly updating schema
Merge branch 'develop' into event_signing

Conflicts:
	synapse/federation/replication.py