getting new stuff mostly
Merge branch 'master' of https://github.com/michaelweinstein/chat_demo

Conflicts:
	public/conversejs/converse.js