work on bisplev/spline files
Merge remote branch 'aurore/master'
work on peak-picker for reconfig
Merge remote-tracking branch 'upstream/master'

Conflicts:
	pyFAI-src/blob_detection.py