编辑删除类目
Merge remote-tracking branch 'origin/master'

Conflicts:
	Test_regress/src/as_test_regress.py