modify by checkstyle
Merge remote-tracking branch 'origin/master'

Conflicts:
	action/src/java/com/jiakun/xplatform/framework/webwork/result/JSONResult.java