笔记协同操作>=3人时，增加patch缓冲逻辑
Merge branch 'master' of github.com:fex-team/agroup

Conflicts:
	package.json