Merge branch 'master' into dev

Conflicts:
	README.rst
	setup.py
	timeside/__init__.py

diff --cc README.rst
Simple merge

diff --cc timeside/__init__.py
index 9cf2959b52d244d40ad2ad44b7660d5a710b0752,6fc906de3e958f05d937e033372688c384157336..1a1e352b789acd8c49859d59c7cc4e453fb2d7e6
--- 1/timeside/__init__.py
--- 2/timeside/__init__.py
+++ b/timeside/__init__.py
@@@ -25,9 -25,9 +25,9 @@@ from __future__ import absolute_impor
  from . import api
  from . import core
  
- 
 +__version__ = '0.5.7'
  
 -__version__ = '0.5.6.3'
+ 
  # Check Availability of external Audio feature extraction librairies
  from .tools import package as ts_package
  _WITH_AUBIO = ts_package.check_aubio()