bug fixed
Merge https://github.com/dgq2010/niot into dgq2010-master

Conflicts:
	source/niot/WebRoot/WEB-INF/classes/cn/niot/rule/RuleFunction.class
	source/niot/src/cn/niot/rule/RuleFunction.java
merge confilict
test case
fix bug
fix bug
Merge pull request #25 from cnnic/master

update local code