Merge pull request #25 from cnnic/master

update local code
update IoTID recognition algorithm
remove conflicts when merging
remove conflicts when merging
nothing important
remove merging error
remove some bugs
improved the kernel algorithm
merged code from cnnic/niot
Merge branch 'dgq2010-master'

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