correction of decode errors in sensors.js
correcting conflicts
Merge branch 'master' into floEtJu