1.2发布文档更新
update doc.org
Merge branch 'master' into develop

Conflicts:
	doc/doc.org