Merge pull request #19 from cnnic/master

update code in dgq2010 repository
Merge pull request #20 from cnnic/master

update local code
Merge pull request #21 from cnnic/master

update local code
add system test function
nothing important
Merge pull request #22 from cnnic/master

update local code
dynamic priprobability & length -1
nothing important
updated the function of IoTIDRecognizeAlg
nothing important
remove some redundant sentences
nothing important
nothing important
Merge https://github.com/dgq2010/niot into dgq2010-master

Conflicts:
	source/niot/WebRoot/WEB-INF/classes/cn/niot/rule/RuleFunction.class
	source/niot/src/cn/niot/rule/RuleFunction.java