调整
Merge remote-tracking branch 'origin/master'

Conflicts:
	Test_regress/src/as_test_regress.py
Merge branch 'master' of https://github.com/yilu282/automation_test