Merge branch 'master', remote branch 'origin'
Merge branch 'master', remote branch 'origin'
Merge branch 'master', remote branch 'origin'
Merge remote branch 'origin'
Merge branch 'master', remote branch 'origin'
adding local_maxmin on 5*5 points, and 3D Savitzky Golay at the 4th
order on a 5*5 patch
work ongoing
catch issues with low memory devices in tests
Merge remote-tracking branch 'origin/devel'

Conflicts:
	test/test_csr.py
Merge branch 'master', remote branch 'origin'
Update tests: prevent seg-fault on low end GTX9600 GPU
The benchmark passes error without failing
Merge remote branch 'origin/master'
Merge remote-tracking branch 'upstream/master'

Conflicts:
	pyFAI-src/blob_detection.py
bring back changes from discared branch
Merge remote branch 'aurore/master'
work in progress on the peak-picking side.
work on blob detection ...
dealing with several parameters
Merge remote-tracking branch 'upstream/master'

Conflicts:
	pyFAI-src/blob_detection.py