Recipes will now pull from master branch.
updated client test program.
Merge branch 'dev'
fixed cursor not updating
XMPP whispering added
infinote testing and bugfixes
the commit before the merge
Merge branch 'master' into js-compiler

Conflicts:
	collab-infinote.el