Revert "remove com app.conf"

This reverts commit d2cdbfcb51559666466ffb3a47184eb4aaea13c2.
Revert "Revert "remove com app.conf""

This reverts commit 2bd480d2d784757e9073333778ec2b1d46b2a0dc.
PPE 20/11

- Création procédure GererInscriptionLicencie
- Création procédure TabInscription_Click
Merge remote-tracking branch 'origin/Alex' into Dev

Conflicts:
	MaisonDesLigues/FrmPrincipale.Designer.cs
	MaisonDesLigues/FrmPrincipale.cs
Merge remote-tracking branch 'origin/Alex' into Dev

Conflicts:
	MaisonDesLigues/FrmPrincipale.Designer.cs
	MaisonDesLigues/FrmPrincipale.cs
Merge remote-tracking branch 'origin/ClÃ©ment' into Dev

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

Signed-off-by: Clément JOLLIET <jolliet.clement@gmail.com>
repair
22/11/2014
23/11/2014
Merge branch 'Dev' of https://github.com/TeriRomain/MDL into Dev

Conflicts:
	MaisonDesLigues/FrmPrincipale.Designer.cs
	MaisonDesLigues/FrmPrincipale.cs
Test de commit

Test de commit to Dev (2 files)
Merge branch 'Dev' of https://github.com/TeriRomain/MDL into Dev

Conflicts:
	MaisonDesLigues/FrmPrincipale.Designer.cs
	MaisonDesLigues/FrmPrincipale.cs
	MaisonDesLigues/MaisonDesLigues.csproj
Merge branch 'Dev' of https://github.com/TeriRomain/MDL into Dev

Conflicts:
	MaisonDesLigues/FrmPrincipale.Designer.cs
change connexion
change connexion
Merge remote-tracking branch 'origin/Dev' into Romain
interface tabAjout mission 2 tache 3
gfdbdgvd

dgdfgd