Add draft comment support
Merge local branch 'draft-comments' with origin/master

Conflicts:
	strata.js