Fix NPE
Merge branch 'master' into geoff_work
Fixes for DeviceManager
Fixes for DeviceType
Making the first basic dropdown work