Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	app/device/service/alarmService.go
#	app/device/service/alarmTerminalService.go
#	app/device/service/captureUintService.go