jeu de test serieux
Merge origin/sprint1.5 into sprint1.5

Conflicts:
	nbproject/project.properties