Merge branch 'master' into dgq2010-master

Conflicts:
	source/niot/WebRoot/WEB-INF/classes/cn/niot/controller/RecoAction.class
	source/niot/src/cn/niot/controller/RecoAction.java
Merge pull request #6 from cnnic/master

update code
update RuleFuncTest file

update RuleFuncTest file
update Back-end program

class file NewIDstdCollisionDetect, IDstrRecognition,
IoTNewRuleRecognitionAction and IoTIDRecognitionAction are updated!
Merge branch 'master' of https://github.com/dgq2010/niot into dgq2010-master

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