2014/03/02
Merge branch 'master' of https://github.com/flotteur/projet_synthese

Conflicts:
	Data_synthese/WCF_Synthese/Web.config