Merge pull request #13 from cnnic/master

update code
update
Merge pull request #14 from cnnic/master

update code
update
update
update interfaces

update interfaces
update interface
txt error
Merge branch 'dgq2010-master'

Conflicts:
	source/niot/WebRoot/WEB-INF/classes/cn/niot/controller/IoTIDRecognitionAction.class
	source/niot/src/cn/niot/controller/IoTIDRecognitionAction.java
delete conflict
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