Merge branch 'dev' into crem

diff --cc app/scripts/app.sh
index 6f07073da4287e3260bdf01f769b509c206fecb9,f6e454dbca5dcbcd2dfe11ebf7bbc5ee8c815285..84fa6f8e8fb23fc218ae21f92d3cfe9d08988ffa
--- 1/app/scripts/app.sh
--- 2/app/scripts/app.sh
+++ b/app/scripts/app.sh
@@@ -39,12 -39,7 +39,7 @@@ if [ $REINDEX = "True" ]; the
  fi
  
  # fix media access rights
- chown www-data:www-data $media
- for dir in $(ls $media); do
-     if [ ! $(stat -c %U $media/$dir) = 'www-data' ]; then
-         chown www-data:www-data $media/$dir
-     fi
- done
 -chown -R www-data:www-data $media
++chown www-data:www-data $media/*
  
  # choose dev or prod mode
  if [ "$1" = "--runserver" ]; then

diff --cc app/settings.py
index 644717d2eb303343101dcbbaeec08db19ad7ccfd,153f00d6ec73e0395dc7d7b840c0a026187b7d2a..848fdc6e85573eb0b2fdfc7cb8ebfa34787b18dd
--- 1/app/settings.py
--- 2/app/settings.py
+++ b/app/settings.py
@@@ -201,9 -202,9 +203,9 @@@ TELEMETA_CACHE_DIR = os.path.join(MEDIA
  TELEMETA_EXPORT_CACHE_DIR = os.path.join(MEDIA_ROOT, 'export')
  TELEMETA_DATA_CACHE_DIR = os.path.join(TELEMETA_CACHE_DIR, 'data')
  FILE_UPLOAD_TEMP_DIR = os.path.join(MEDIA_ROOT, 'tmp')
- FILE_UPLOAD_PERMISSIONS = 0644
+ FILE_UPLOAD_PERMISSIONS = 0o644
  
 -TELEMETA_DOWNLOAD_ENABLED = True
 +TELEMETA_DOWNLOAD_ENABLED = False
  TELEMETA_STREAMING_FORMATS = ('mp3', 'ogg')
  TELEMETA_DOWNLOAD_FORMATS = ('wav', 'mp3', 'ogg', 'flac')
  TELEMETA_PUBLIC_ACCESS_PERIOD = 51

diff --cc docker-compose.yml
Simple merge

diff --cc lib/TimeSide
index 0000000000000000000000000000000000000000,004c33b1532acafb2f3507fce8909d8f100dab09..a8d599754de80712a657c115a6e7d22e3dea104c
mode 000000,160000..160000
--- /dev/null
--- 2/lib/TimeSide
+++ b/lib/TimeSide
@@@ -1,0 -1,1 +1,1 @@@
 -Subproject commit 004c33b1532acafb2f3507fce8909d8f100dab09
++Subproject commit a8d599754de80712a657c115a6e7d22e3dea104c