CPC code
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/rule/RuleFunction.class
	source/niot/src/cn/niot/controller/RecoAction.java
	source/niot/src/cn/niot/rule/RuleFunction.java
merge revise
EANUPC & CID code
Merge pull request #1 from cnnic/master

update code