更新
Merge branch 'master' of https://github.com/wikimo/jinbi

Conflicts:
	WebContent/users/userslist.jsp
更新

新添加了设备模块