Merge pull request #11 from cnnic/master

update code
fix js conflict
Merge pull request #12 from cnnic/master

fix js conflict
update interface
Merge branch 'master' of https://github.com/dgq2010/niot

Conflicts:
	source/niot/WebRoot/WEB-INF/classes/cn/niot/controller/RecoAction.class
	source/niot/WebRoot/WEB-INF/classes/cn/niot/dao/RecoDao.class
testcase
t
Merge branch 'master' of https://github.com/dgq2010/niot into dgq2010-master
Merge branch 'dgq2010-master'

Conflicts:
	source/niot/WebRoot/WEB-INF/classes/cn/niot/controller/RecoAction.class
add something for function 2; add sth for function 1; change ui for function 3
fix rule bugs
t
Merge branch 'xiaobaicoding-master'
Merge pull request #13 from cnnic/master

update code
update
change the page title; change the function 2; add the tooltip for function 3
add tooptip for funtion 1
medsupervisecode fix bug
Merge https://github.com/xiaobaicoding/niot into xiaobaicoding-master
Merge branch 'xiaobaicoding-master'