删掉那些没用的
Merge remote-tracking branch 'origin/master'

Conflicts:
	Test_regress/src/as_test_regress.py
	Test_regress/src/login.py