Merge branch 'master' into testing
Settings dialog rework
Dialog rework
more dialogs
Yet more dialog reworks
Dialogs
Dialogs
minor
more dialog updates
Tweaks
Music views updated
various
.DS_Store annihilation
Reworking movieinfo: currently broken
tweak
VideoInfo update
more videodialog
more dialogging
Merge branch 'testing'
Last minute