Merge branch 'dev' into dev-server-TM

Conflicts:
	timeside/core/analyzer.py

diff --cc timeside/core/analyzer.py
index f0074e21cf3425199246e566e9e32440e416860d,b3e2ce9a4d5f733e7f5adba32d01e19bdf4a88fa..348d3a8cb4742da0166137613bc286ef5baf0915
--- 1/timeside/core/analyzer.py
--- 2/timeside/core/analyzer.py
+++ b/timeside/core/analyzer.py
@@@ -848,11 -833,7 +833,7 @@@ class FrameValueObject(ValueObject, Fra
              else:
                  chunksize = 1
                  numchunks = nb_frames
 -            
 +
-             #print "nb_frames %d" % nb_frames
-             #print "chunksize %d" % chunksize
-             #print "numchunks %d" % numchunks
- 
              if self.data.ndim <= 1:
                  ychunks = self.data[:chunksize*numchunks].reshape((-1,
                                                                     chunksize))

diff --cc timeside/server/models.py
Simple merge