aaaa
Merge branch 'master' of https://github.com/hanyong123/my-autotest

Conflicts:
	8196C_EN/common.py
	8196C_EN/keyword.txt
	8196C_EN/lang_var.txt