CSS tweaks from collective.xmpp.chat
tinysort's name changed so this dependency wasn't registered.
Don't use ids for the login form inputs
Add French translations, courtesy of @tdesvenain
Mention FR
Updates #47

Mention FR translations.
Make sure "... is typing" gets translated.
Small update in translations section. Regenerated docs.
The word 'me' wasn't translation aware.

Conflicts:
	locale/converse.pot
Add new Makefile step "merge" and document it.
Regenerated docs
Merge new translations into the PO files
Bugfix. Messages were stored against buddy JID and not own JID
For uniqueness, we need both JIDs for messages localStorage Fixes #49
Bump version everywhere and regenerate docs.
Bump version and minimize files.
Bump version and minimize files.
Merge branch 'master' of github.com:jcbrand/converse.js
Merge branch 'master' into gh-pages

Conflicts:
	docs/html/searchindex.js