Merge origin/master

Conflicts:
	public/JS/affichageCarte.js
Merge origin/master

Conflicts:
	public/JS/affichageCarte.js