删除
shanchu
Merge branch '20140823' into 20140821

Conflicts:
	新建文本文档.txt