Merge pull request #11 from cnnic/master

update code
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
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