Merge branch 'master' into dgq2010-master

Conflicts:
	source/niot/WebRoot/WEB-INF/classes/cn/niot/controller/RecoAction.class
	source/niot/src/cn/niot/controller/RecoAction.java
Merge branch 'master' of https://github.com/dgq2010/niot into dgq2010-master

Conflicts:
	source/niot/WebRoot/WEB-INF/classes/cn/niot/controller/RecoAction.class
	source/niot/WebRoot/WEB-INF/classes/cn/niot/service/CompareCode13.class
	source/niot/src/cn/niot/controller/RecoAction.java
update function tag usage
fix ean bug
Merge branch 'xiaobaicoding-master'

Conflicts:
	source/niot/WebRoot/WEB-INF/classes/cn/niot/controller/IoTNewRuleRecognitionAction.class
	source/niot/src/cn/niot/controller/IoTNewRuleRecognitionAction.java
Merge pull request #7 from cnnic/master

update code