Merge Branche_1

Conflicts:
	data/Calcul.php