jmockit
Merge remote-tracking branch 'origin/master'

Conflicts:
	biz/src/java.test/com/jiakun/xplatform/data/service/DataServiceTest.java