baba
aaa
Merge branch 'master' of https://github.com/jackey90/Rerun.git

Conflicts:
	src/main/java/com/ea/rerun/common/model/TestResult.java