test connexion
Merge origin/master
test connexion
Merge origin/master

Conflicts:
	nbproject/private/private.xml
travail 04/04
Merge origin/master
travail 04/04
Merge origin/master