- Removed second initialisation of Canvas CCalib2 (calibration summary).
Merge branch 'PropXtalkImprovements'
- trying to sort out some merge mess.
Conflicts:
	Calib.h
- couple of small bugs in building of xtalk matrix.