Conflicts:
	docs/doctrees/index.doctree
	docs/html/index.html
	docs/html/searchindex.js

Conflicts:
	docs/html/searchindex.js
	index.html

Trying to flesh out the bug where in certain instances the 'pending contacts'
header doesn't get removed after the last pending contact is removed.

Makes it more secure, since the enclosed converse object as access to
privileged data, we don't want people to inject code that could expose that.

This requires that valid jid, rid, sid and bosh_service_url values be given (or
a valid connection object that was already attached).

Updated the docs to reflect these changes.

Conflicts:
	docs/html/searchindex.js
	index.html

Let the message only be sent when an event has been triggered.
This allows us to first (if necessary) let OTR process the image.

- /otr will generate a new private key (or fetch it from storage).

Conflicts:
	docs/html/_static/stylesheet.css
	docs/html/searchindex.js