Merge origin/AymaneV2 into AymaneV2

Conflicts:
	src/view/VueFenetrePrincipale.java