fix bug
Merge branch 'dgq2010-master'

Conflicts:
	source/niot/WebRoot/WEB-INF/classes/cn/niot/rule/RuleFunction.class
	source/niot/src/cn/niot/rule/RuleFunction.java
remove confilict
Merge pull request #28 from cnnic/master

update local code