git测试
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	docbook/userguide/chapters/ch03-CommonConfiguration.xml