confluence cleanup
don't associate m3u playlists with pictures
Merge pull request #3486 from ronie/m3u

don't associate m3u playlists with pictures
Merge pull request #3484 from ronie/confluence-fixes

[Confluence] cleanup