Merge branch 'diadems' into dev

Conflicts:
	timeside/analyzer/__init__.py

diff --cc timeside/analyzer/__init__.py
index 6f13282ae0be2b4a0d168b36d27a435e017744ab,ab43ac77000bb035717adc14180dc378b40d1001..e8962cec4ae5b88694cdabb0068270bb31d57cd4
--- 1/timeside/analyzer/__init__.py
--- 2/timeside/analyzer/__init__.py
+++ b/timeside/analyzer/__init__.py
@@@ -7,7 -7,5 +7,9 @@@ from aubio_pitch import 
  from aubio_mfcc import *
  from aubio_melenergy import *
  from aubio_specdesc import *
- from vamp_plugin import VampSimpleHost
 +from yaafe import * # TF : add Yaafe analyzer
 +from spectrogram import Spectrogram
 +from waveform import Waveform
++from vamp_plugin import VampSimpleHost
+ from irit_speech_entropy import *
+ from irit_speech_4hz import *