Merge pull request #19 from cnnic/master

update code in dgq2010 repository
update RFID functions
字符串截取
Merge pull request #1 from lhx2013/master

字符串截取
utf8 encoded update
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
fix bug
Merge pull request #22 from cnnic/master

update local code
dynamic priprobability & length -1
nothing important
fix bug
add ending code
Merge remote-tracking branch 'upstream/master'

Conflicts:
	source/niot/WebRoot/WEB-INF/classes/cn/niot/controller/RecoAction.class
	source/niot/WebRoot/WEB-INF/classes/cn/niot/rule/RuleFunction.class
merge from cnnic git
wt paramcode bugs
updated the function of IoTIDRecognizeAlg
nothing important