Merge origin/master into HEAD

Conflicts:
	Plateau.cpp
	Plateau.h
	Structures.h
	nbproject/private/private.xml
Merge origin/master into HEAD

Conflicts:
	Plateau.cpp
	Plateau.h
	Structures.h
	nbproject/private/private.xml