Trying several parameters
Merge remote-tracking branch 'upstream/master' into HEAD

Conflicts:
	pyFAI-src/blob_detection.py
	test/blob.py
changing the test image
Merge remote-tracking branch 'upstream/master' into HEAD

Conflicts:
	pyFAI-src/blob_detection.py
	test/blob.py
version with artificial images, modifying some parameters
Merge remote-tracking branch 'upstream/master' into HEAD

Conflicts:
	test/blob.py
correction of half a pixel when binning and when plotting to have the correct maximum
work on bisplev/spline files
Merge remote branch 'aurore/master'
work on peak-picker for reconfig