Merge branch 'dev_pengyz'

Conflicts:
	.gitignore
Revert "WIP on dev_pengyz: 12309c4 Merge branch 'dev_pengyz'"

This reverts commit 13c1c094551bcd71651a263944431be1496ef501, reversing
changes made to 12309c4902dafa4b50594c857783a894b207afa7.

Conflicts:
	doc/data/吃药call.xml
	doc/data/喊话.xml
	doc/data/寻路call.xml
change data
该了下文档的结构
Merge branch 'dev_pengyz'