Setter and getters coté CalibrateController
Merge branch 'master' of https://github.com/thibautpalier/hackaton

Conflicts:
	hackoursSRC/hackours/ViewController.m