Merge apdidf_theme_git/master into HEAD

Conflicts:
	apdidf/icons-formation.php
	apdidf/icons-mission.php