Device type is properly assigned to SOD server (They are no longer all "Tabletop")
Merge branch 'master' into Gabi-WallDisplayLayoutTesting