26 mars
Merge branch 'master' of git://github.com/flotteur/projet_synthese

Conflicts:
	Data_synthese/BO_Synthese/bin/Debug/BO_Synthese.dll.config
Merge branch 'master' of https://github.com/flotteur/projet_synthese