Merge branch 'dev' into diadems

diff --cc timeside/analyzer/__init__.py
index e7a2c8cb4f8cf20749394378a7602946c714f539,27aa32d344913f70c19ae31541a92b4ff2b89b6b..c6b78d8adc42294fb445dd5d263cf833cc75d238
--- 1/timeside/analyzer/__init__.py
--- 2/timeside/analyzer/__init__.py
+++ b/timeside/analyzer/__init__.py
@@@ -13,8 -13,5 +13,9 @@@ from waveform import Wavefor
  from vamp_plugin import VampSimpleHost
  from irit_speech_entropy import IRITSpeechEntropy
  from irit_speech_4hz import IRITSpeech4Hz
 +from irit_diverg import IRITDiverg
 +from irit_music_SLN import IRITMusicSLN
 +from irit_music_SNB import IRITMusicSNB
 +#~ from irit_monopoly import IRITMonopoly
  from odf import OnsetDetectionFunction
+ from limsi_sad import LimsiSad