commit intermediaire
Merge master into 2_Admin
Merge origin/4_newBranch2

Conflicts:
	nbproject/project.properties