modif fichier de conf
Merge branch 'Romain' of https://github.com/TeriRomain/MDL.git
interface ajout theme
Merge remote-tracking branch 'origin/Romain' into Dev
Merge remote-tracking branch 'origin/Dev' into Romain
tache 3 : interface graphique
20/11/2014
Merge remote-tracking branch 'origin/Romain' into Dev
test

Signed-off-by: ducoudrayalex <ducoudray.alex@gmail.com>
Merge branch 'Dev' into Alex

Conflicts:
	MaisonDesLigues/FrmPrincipale.Designer.cs
	MaisonDesLigues/FrmPrincipale.cs