DAS
20140607早
Merge remote-tracking branch 'zygl/master'

Conflicts:
	test-output/Default suite/Default test.html
	test-output/Default suite/Default test.xml
	test-output/Default suite/testng-failed.xml
	test-output/emailable-report.html
	test-output/index.html
	test-output/old/Default suite/classes.html
	test-output/old/Default suite/methods-alphabetical.html
	test-output/old/Default suite/methods.html
	test-output/old/Default suite/testng.xml.html
	test-output/old/Default suite/toc.html
	test-output/old/index.html
	test-output/testng-failed.xml
	test-output/testng-results.xml
20170607晚数据库测试