random untest
Merge branch 'master' of https://github.com/cnnic/niot

Conflicts:
	source/niot/WebRoot/WEB-INF/classes/cn/niot/controller/RecoAction.class
	source/niot/src/cn/niot/controller/RecoAction.java