dialog edit v1
Merge branch 'WikiInfoWithImage' of https://github.com/pam-anderson/JamsMusicPlayer into WikiInfoWithImage
Clean up dialog view
clean up
Merge master with branch