attempt to fix for blaze
Merge remote-tracking branch 'origin/blaze'

Conflicts:
	demo/client/client.coffee
	demo/client/index.html
	sharejs-client.coffee