tabacco code
conflict
delete niot directory
Merge branch '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/WebRoot/WEB-INF/classes/cn/niot/util/RecoUtil.class
	source/niot/src/cn/niot/controller/RecoAction.java
	source/niot/src/cn/niot/rule/RuleFunction.java
	source/niot/src/cn/niot/util/RecoUtil.java
23/24/5 code
check input error
update rulefunction

update rulefunction wrote  by xujiangfeng
update rulefunction

update rulefunction again