delete conflict txt
add function for page 2; fix the bugs for firefox about tag input
test code
Merge branch 'xiaobaicoding-master'

Conflicts:
	source/niot/WebRoot/WEB-INF/classes/cn/niot/controller/IoTNewRuleRecognitionAction.class
Merge branch 'master' of https://github.com/cnnic/niot

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