adding sensor id
Merge remote-tracking branch 'origin/naming' into naming