Merge pull request #7 from cnnic/master

update code
update code

update code
IoTNewRuleRecognitionAction.java

uodate IoTNewRuleRecognitionAction.java
Merge branch 'master' of https://github.com/cnnic/niot

Conflicts:
	source/niot/WebRoot/WEB-INF/classes/cn/niot/controller/IoTNewRuleRecognitionAction.class
	source/niot/src/cn/niot/controller/IoTNewRuleRecognitionAction.java
add part two
Merge branch 'master' of https://github.com/cnnic/niot

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/WebRoot/WEB-INF/classes/cn/niot/controller/RecoAction.class
	source/niot/src/cn/niot/controller/RecoAction.java
Merge branch 'master' of https://github.com/cnnic/niot

Conflicts:
	source/niot/WebRoot/WEB-INF/classes/cn/niot/controller/RecoAction.class
	source/niot/src/cn/niot/controller/RecoAction.java