junit test upgrade
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/test/java/test/base/OrderedRunner.java
	src/test/java/test/mapper/TestUserMapper3.java