Merge origin/master

Conflicts:
	css/media-queries.css
Merge origin/master
Merge origin/master

Conflicts:
	css/media-queries.css

Fix sur le hover des sentiers
Merge origin/master
Merge origin/master

Conflicts:
	css/media-queries.css

Fix sur le hover des sentiers