Conflicts:
	Gruntfile.js
	converse.min.js

Instead we build manually. Fixed paths in build.js

Conflicts:
	Gruntfile.js

Conflicts:
	converse.js

If true, only users with a status of 'online' will be shown in the contacts
roster.

Conflicts:
	converse.js

Move all module-level functions/variables and Backbone Modules/Views together.
Add headings to indicate logical sections.
Make statuses variable module-level and indicate that it's a constant (all caps)

This method shouldn't be called when contact requests aren't allowed because
roster items are then not created for contact requests.

Conflicts:
	converse.min.css
	converse.min.js

Instead we build manually. Fixed paths in build.js

Updated information of files, required during minify

Conflicts:
	README.rst
	converse.js

- Register handlers that depend on the roster inside initRoster and the
  message handler inside chatboxes.onConnected. This solves problem of presence
  stanzas being received before handlers are initialized. Updates #65

- Check if MUC is allowed during feature discovery

Conflicts:
	converse.js
	index.html

Conflicts:
	converse.js
	index.html

Add config option ``allow_contact_requests`` to toggle user adding

Conflicts:
	converse.css
	converse.js
	index.html

Add allow_muc config option

Conflicts:
	tests_main.js

Conflicts:
	index.html

Conflicts:
	locale/locales.js

Conflicts:
	index.html

Add Russian translation by bkocherov (actually made against master branch)

Conflicts:
	locale/locales.js

Conflicts:
	converse.css

I didn't merge converse.css or converse.min.css, instead fell back to master versions.