CreateEmptys + Test CreateEmptys
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/wise/dao/SysSettingDAO.java
	src/main/java/com/wise/util/SysSettingAdapter.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/test/java/com/wise/engine/integration/BaseEngineIntegrationTest.java
Merge remote-tracking branch 'origin/master'
CreateEmptys + Test CreateEmptys