Conflicts:
	bower.json
	converse.css
	converse.js
	main.js
	tests_main.js

With auto_subscribe=True, "Pending Contacts" header didn't disappear
after user was added to the roster.

Don't sort roster contacts needlessly.
Don't call show() or hide() needlessly.
No need for setting a 'sorted' attr on the last item.

Also expand on the security question.

Allows for sending the custom status to the server via ajax.

We need variable sprintf type var interpolation

(Aids with bungle integration)

- Add nolocales.js and let the __ function handle case where there aren't any
  locales specified.

Also:
In require config, change localstorage to backbone.localStorage (for better
integration with bungle).

Conflicts:
	converse.css

Can add it back later and fix.

grunt-contribute-requirejs doesn't support almond (yet?).