Merge origin/master

Conflicts:
	src/heb/esi/manille/controller/ManilleControlleur.java
	src/heb/esi/manille/view/FenetreManille.java
	src/heb/esi/manille/view/JeuManilleVue.java
Merge origin/master
Merge origin/master

Conflicts:
	src/heb/esi/manille/controller/ManilleControlleur.java
	src/heb/esi/manille/view/FenetreManille.java
	src/heb/esi/manille/view/JeuManilleVue.java