Merge pull request #1 from cnnic/master

update code
update RuleFunction and CollisionDetectAlgorithm
update rulefunction and collisiondetectionalgorithm
Merge pull request #3 from dgq2010/master

update ruleFunction and CollisionDetectionAlgorithm
tabacco code
add junit test case

add junit test case
Merge pull request #2 from cnnic/master

update 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
html related files and collision detecting

add html related files and update collision detecting algorithm
23/24/5 code
check input error
update rulefunction

update rulefunction wrote  by xujiangfeng
update rulefunction

update rulefunction again
add unit test class

add unit test class
delete no use directory and package
xxxxx
UI Change and add new acction to transmit data
change a class name