Correctif sur la cible du lien Param Bull (HTML ou PDF)
Merge branch 'release-1.6.0' into release-1.6.1
Merge branch 'release-1.6.1' into release-1.6.2

Conflicts:
	lib/header_barre_scolarite_template.php
Merge branch 'release-1.6.2'