Merge from master
Merge from master
Merge from master
Merge from master
Bug fix of scale
Merge branch 'master' into i2

Conflicts:
	src/main/java/com/xingcloud/webinterface/utils/IdResultBuilder.java