Merge branch 'master' of git://github.com/bkocherov/converse.js into bkocherov-master

Conflicts:
	locale/locales.js

Conflicts:
	index.html

Add Russian translation by bkocherov (actually made against master branch)
Merge branch '0.6.x'

Conflicts:
	index.html