bug fixed
bug fixed
bug and iot checking
add function
fix bug
fix bug
Merge remote-tracking branch 'upstream/master'

Conflicts:
	source/niot/WebRoot/WEB-INF/classes/cn/niot/controller/RecoAction.class
	source/niot/WebRoot/WEB-INF/classes/cn/niot/rule/RuleFunction.class