to resolve confliction, so that I might be able to fetch Henry's change
Merge branch 'master' of https://github.com/hbaaron/ikan

Conflicts:
	client/converse/converse.js