Merge branch 'master', remote branch 'origin'
Merge remote branch 'origin/master'
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