half pixel offset not in bilinear
Merge branch 'master', remote branch 'origin'
issue in the name of the Fairchild
if recalib run multiple times ... reset max_rings
implements issue #101
integrate blob detection for recalib ...
not yet working
work on the integration of blob detection into calibration
new CLI interface for calibration using either blob detection or
massif
fix few bugs with interactiv mode.
update recalib to use blob detection by default
Merge remote-tracking branch 'upstream/master'

Conflicts:
	pyFAI-src/blob_detection.py