add new function

add new function
add RFID scan from web
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
rule added
change sth from fdl
merge from cnnic
Merge pull request #26 from xiaobaicoding/master

add new functions
add new rfid function
Merge branch 'master' of https://github.com/lhx2013/niot into lhx2013-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/util/RecoUtil.java
c
fix the conflict
Merge remote-tracking branch 'upstream/master'
add new RFID scan functions and
RFID scan update
add wu's update
update RFID function for web client