Merge branch 'uif' into fix-HTTP-500-on-playlist-delete

diff --cc interface.py
index 1610f6bc1afdb9933614cc8b0ac5f0154d7e27c1,296ea7f2d904063dd0b50f939bf8a22255690794..98e82a23139a0158f166b65d7b4b23d786fe2d47
--- 1/interface.py
--- 2/interface.py
+++ b/interface.py
@@@ -85,7 -84,13 +85,7 @@@ def index()
                  files = music_library.get_files_recursively(folder)
              else:
                  files = music_library.get_files(folder)
-             files = list(map(lambda file: ('file', folder + '/' + file, datetime.now().timestamp()), files))
 -            files = list(map(
 -              lambda file: (
 -                'file',
 -                os.path.join(folder, file)
 -              ),
 -              files
 -            ))
++            files = list(map(lambda file: ('file', os.path.join(folder, file), datetime.now().timestamp()), files))
              print('Adding to playlist: ', files)
              var.playlist.extend(files)
          elif 'delete_music' in request.form: