Solution for calibration
Merge remote-tracking branch 'origin' into pierre's_branch

Conflicts:
	brick_interface.py
	calibration.py