Fixes #100 - UI for selecting badge theme
Merge remote-tracking branch 'origin/master'