bug fixed
Merge branch 'menglunyang-master'

Conflicts:
	source/niot/WebRoot/WEB-INF/classes/cn/niot/rule/RuleFunction.class
	source/niot/src/cn/niot/rule/RuleFunction.java
test
Merge branch 'master' of https://github.com/cnnic/niot

Conflicts:
	source/niot/WebRoot/WEB-INF/classes/cn/niot/rule/RuleFunction.class
	source/niot/WebRoot/WEB-INF/classes/cn/niot/service/IDstrRecognition.class
Merge pull request #1 from cnnic/master

update code of menglunyang according to cnnic/niot