add new function

add new function
Merge branch 'master' of https://github.com/Fangdl666/niot

Conflicts:
	source/niot/src/cn/niot/controller/RecoAction.java
	source/niot/src/cn/niot/dao/RecoDao.java
	source/niot/src/cn/niot/rule/RuleFunction.java
change sth from fdl