Merge pull request #15 from cnnic/master

update code
Merge pull request #16 from cnnic/master

update local code from cnnic/niot
modification of not importance

modification of not importance, can be ignored!
Merge https://github.com/dgq2010/niot
Merge pull request #17 from cnnic/master

update code in dgq2010 repository
Merge pull request #27 from xiaobaicoding/master

add rule functions and RFID scan js functions
delete no use code
Merge branch 'master' of https://github.com/cnnic/niot

Conflicts:
	source/niot/WebRoot/WEB-INF/classes/cn/niot/rule/RuleFunction.class
new functions
rule added
rule added
rule and tes functions
rule function added
rule added
bug fix
herbinate debug_time function
add cellphone&vehicle number
Merge branch 'cnnic-master'

Conflicts:
	source/niot/WebRoot/WEB-INF/classes/cn/niot/dao/RecoDao.class
	source/niot/WebRoot/WEB-INF/classes/cn/niot/rule/RuleFunction.class
	source/niot/WebRoot/WEB-INF/classes/cn/niot/service/IDstrRecognition.class
	source/niot/WebRoot/WEB-INF/classes/cn/niot/util/RecoUtil.class
	source/niot/src/cn/niot/dao/RecoDao.java
	source/niot/src/cn/niot/rule/RuleFunction.java
	source/niot/src/cn/niot/util/RecoUtil.java
nothing important
bug fixed