xxxxx
UI Change and add new acction to transmit data
change a class name
Merge branch 'master' of https://github.com/xiaobaicoding/niot into xiaobaicoding-master

Conflicts:
	source/niot/WebRoot/WEB-INF/classes/.struts.mex
	source/niot/src/.struts.mex