Mise a jour
Merge branch 'master' of https://github.com/nicolas-blanc/Jeux-Str

Conflicts:
	nbproject/configurations.xml