change functions' name
add rule functions
add rule functions
f
add new function

add new  test function
add new function

add new test function
add new test function
Revert "add new test function"

This reverts commit 9a56b934196f1a4a1eb232483154463db14e8dc9.
Revert "Revert "add new test function""

This reverts commit c7ed1070b7ddba02af43d8dcf307f46bba860697.
Merge branch 'master' of https://github.com/Fangdl666/niot

Conflicts:
	source/niot/WebRoot/WEB-INF/classes/cn/niot/controller/RecoAction.class
	source/niot/src/cn/niot/controller/RecoAction.java
update RecoDao.java to FDL
Merge branch 'xiaobaicoding-master'

Conflicts:
	source/niot/WebRoot/WEB-INF/classes/cn/niot/controller/RecoAction.class
	source/niot/WebRoot/WEB-INF/classes/cn/niot/dao/RecoDao.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/dao/RecoDao.java
	source/niot/src/cn/niot/rule/RuleFunction.java
	source/niot/src/cn/niot/util/RecoUtil.java