update the json format for device and remove the Cal in Sensor
Merge branch 'master' of https://github.com/msdc/wirelessSensor
update the json format for device and remove the Cal in Sensor