Merge remote-tracking branch 'siked/2.0' into 2.0

# Conflicts:
#	.idea/Cold_Api.iml
#	Nats/Nats.go
#	Nats/NatsWx.go
#	controllers/Data.go
#	controllers/Device.go
#	lastupdate.tmp
#	models/Device/Device.go
#	models/Device/DeviceSensor.go
#	views/Device/Device.html
#	views/Device/DeviceClass-.html
#	views/Device/DeviceClass.html
#	views/Device/DeviceLogs.html