xwen nmbryant: fix refresh issue of deck combo box
xwen nmbryant: fix merging conflicts
Merge branch 'dev' of github.com:pelferina/wpi-suite into dev