édition des batiments
Merge branch 'master' of https://github.com/nicolas-blanc/Jeux-Str

Conflicts:
	nbproject/Makefile-Debug.mk
	nbproject/Makefile-Release.mk
	nbproject/project.xml