Accidently checked in some test code, should fix badges on the badge list/grid
Think I fixed the issue with dialogs not showing correctly
Think I fixed the dialog issue
Merge remote-tracking branch 'remotes/upstream/master'
Added additional backgrounds