local`:x
Merge remote-tracking branch 'origin/master'

Conflicts:
	sift-src/plan.py
Merge remote-tracking branch 'github/master'
Merge remote-tracking branch 'origin'
Merge remote-tracking branch 'taillefer/master'
Merge remote-tracking branch 'origin'
Merge remote-tracking branch 'pierre/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin'
Merge branch 'master', remote branch 'origin'
Merge remote branch 'origin/master'
Merge remote-tracking branch 'origin'
work on automatic outlier spotting : looks OK
Merge remote branch 'tabor/master'