vendor
Merge remote-tracking branch 'origin/master'

Conflicts:
	vues/v_modif_bug_tech.php
vendor