bla2
Merge remote-tracking branch 'origin/master'

Conflicts:
	pyFAI_JAC.tex
about calibrants