把分支master和crossToTest进行合并

Merge branch 'master' into crossToTest

Conflicts:
	testBranch02.txt
	testBranch03.txt
衍合方向错误导致第二次合并和解决冲突
Merge branch 'master' of https://github.com/zknyy/agoncal-book-javaee7

Conflicts:
	testBranch02.txt
	testBranch03.txt