unuseful
Merge remote-tracking branch 'upstream/master'

Conflicts:
	source/niot/WebRoot/WEB-INF/classes/cn/niot/controller/IoTIDRecognitionAction.class
	source/niot/WebRoot/WEB-INF/classes/cn/niot/controller/IoTNewRuleRecognitionAction.class
	source/niot/src/cn/niot/controller/IoTIDRecognitionAction.java
	source/niot/src/cn/niot/controller/IoTNewRuleRecognitionAction.java
new
update from upstream
Merge remote-tracking branch 'upstream/master'

Conflicts:
	source/niot/WebRoot/WEB-INF/classes/cn/niot/controller/IoTIDRecognitionAction.class
	source/niot/WebRoot/WEB-INF/classes/cn/niot/controller/IoTNewRuleRecognitionAction.class
	source/niot/src/cn/niot/controller/IoTIDRecognitionAction.java
	source/niot/src/cn/niot/controller/IoTNewRuleRecognitionAction.java
update function 1