changed deviceId to be start of json command instead of method (no functional change)
Merge branch 'server'