Fixed various display bugs
Added UpDownSwitch and ColorPicker devices
Merge branch 'DisplayFix'