Merge branch 'TrunkEric' into masterOnLocal

Conflicts:
	XML测试.xml
Merge branch 'master' of github.com:wwolf5566/testhub into MasterForFE